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

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

2024-01-17 Thread Petr Vaněk

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

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

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

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

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

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

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

2024-01-16 Thread Ionen Wolkens

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

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

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

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

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

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

2023-12-20 Thread Joonas Niilola

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

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

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

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

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

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

2023-12-20 Thread Joonas Niilola

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

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

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

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

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

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

2023-12-05 Thread Petr Vaněk

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

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

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

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

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

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

2023-11-17 Thread Sam James

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

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

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

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

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

2023-11-17 Thread Sam James

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

sys-apps/s6-rc: add 0.5.4.2

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

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

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

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

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

2023-05-20 Thread Joonas Niilola

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

sys-apps/s6-rc: drop 0.5.3.2

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

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

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

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

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

2023-05-06 Thread Arthur Zamarin

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

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

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

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

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

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

2023-04-15 Thread Joonas Niilola

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

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

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

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

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

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

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

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

2023-03-29 Thread Joonas Niilola

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

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

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

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

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

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

2023-03-28 Thread Sam James

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

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

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

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

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

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

2023-03-24 Thread Arthur Zamarin

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

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

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

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

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

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

2023-02-24 Thread Joonas Niilola

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

sys-apps/s6-rc: add 0.5.4.1

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

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

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

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

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

2023-02-21 Thread Sam James

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

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

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

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

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

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

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

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

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

2023-02-21 Thread Sam James

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

sys-apps/s6-rc: add 0.5.4.0

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

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

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

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

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

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

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

2023-01-16 Thread Sam James

commit: 19a9b40a7bd29bde690d267387b5042942c595e4
Author: Petr Vaněk  atlas  cz>
AuthorDate: Mon Jan 16 20:10:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 17 01:52:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a9b40a

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

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

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

diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index aed39d3983af..0f616fa5c2bf 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -1,6 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   arka...@atlas.cz
+   Petr Vaněk
+   

sam...@sholland.org
Samuel Holland
@@ -9,10 +13,6 @@
willi...@gentoo.org
William Hubbs

-   
-   arka...@atlas.cz
-   Petr Vaněk
-   

proxy-ma...@gentoo.org
Proxy Maintainers

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

2023-01-16 Thread Sam James

commit: 83858a065f0d22a90fcf884e8a0076a14c7e88a7
Author: Petr Vaněk  atlas  cz>
AuthorDate: Mon Jan 16 12:18:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 17 01:52:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83858a06

sys-apps/s6-rc: add 0.5.3.3

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

Fixes: ab67779a229a ("sys-apps/s6-rc: drop IUSE="static static-libs"")
Bug: https://bugs.gentoo.org/890879
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 7986e9d80111..f2ab4d8a5da8 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1 +1,2 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
+DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B 
b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e
 SHA512 
9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b

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

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

2022-08-16 Thread Joonas Niilola

commit: cdc6462719c23361cf2515ab551bbc9483c0cc5a
Author: Petr Vaněk  atlas  cz>
AuthorDate: Tue Aug 16 10:19:15 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 15:26:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc64627

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

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

 sys-apps/s6-rc/Manifest|  1 -
 sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild | 61 --
 2 files changed, 62 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 4be06d8da2c9..7986e9d80111 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1 @@
-DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 
6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63
 SHA512 
1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
deleted file mode 100644
index 4c6c8d4c1bca..
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs"
-
-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(-)?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/execline
-   --with-lib=/usr/$(get_libdir)/s6
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   $(use_enable static allstatic)
-   $(use_enable static static-libc)
-   $(use_enable static-libs static)
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
-   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
-   ewarn "and the documentation for the s6-rc-format-upgrade utility."
-}

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

2022-08-01 Thread Joonas Niilola

commit: 677371c45e59d24463e8dfcb25dfcac3b455b530
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:30 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677371c4

sys-apps/s6-rc: Stabilize 0.5.3.2 x86, #862636

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

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

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

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

2022-08-01 Thread Joonas Niilola

commit: df40a9827666069e70ddc2fb6263ae3d477ecd5d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:36 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df40a982

sys-apps/s6-rc: Stabilize 0.5.3.2 amd64, #862636

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

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

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

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

2022-07-09 Thread Sam James

commit: 2dd66ee61302767c022e9d127fbf6bb86d5e8327
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Jul  9 06:35:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  9 07:49:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd66ee6

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

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

 sys-apps/s6-rc/Manifest|  1 -
 sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild | 61 --
 2 files changed, 62 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 0e557733c2b1..4be06d8da2c9 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,2 @@
-DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 
8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1
 SHA512 
0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 
6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63
 SHA512 
1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
deleted file mode 100644
index 4c6c8d4c1bca..
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs"
-
-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(-)?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/execline
-   --with-lib=/usr/$(get_libdir)/s6
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   $(use_enable static allstatic)
-   $(use_enable static static-libc)
-   $(use_enable static-libs static)
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
-   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
-   ewarn "and the documentation for the s6-rc-format-upgrade utility."
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/, sys-apps/s6/, net-misc/s6-networking/, sys-apps/s6-linux-init/

2022-06-24 Thread Sam James

commit: 01de0621eb30f2c1a3fc98b77cf38be90a4837f7
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Jun 16 13:50:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 05:35:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01de0621

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

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

 net-misc/s6-networking/s6-networking-2.5.1.0.ebuild |  2 +-
 sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild |  2 +-
 sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild |  2 +-
 sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild |  2 +-
 sys-apps/s6/s6-2.11.1.1.ebuild  | 13 +
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild 
b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
index c57afa4fb6c3..8222c5bf856a 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="static? ( static-libs )
 
 RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
=dev-libs/skalibs-2.11*:=[static-libs?]
-   >=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+   >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?]
ssl? ( dev-libs/libretls )
!static? (
>=net-dns/s6-dns-2.3.5.2:=

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 01807f8d704e..002a1d69f2cc 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
@@ -18,7 +18,7 @@ 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?]
+   >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?]
sysv-utils? (
!sys-apps/systemd[sysv-utils]
!sys-apps/sysvinit

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
index 6feff233b4ae..3a8244973408 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
@@ -18,7 +18,7 @@ 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?]
+   >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
index 6feff233b4ae..3a8244973408 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
@@ -18,7 +18,7 @@ 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?]
+   >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 

diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
index ba06fd3ede5b..dcdeeef35af5 100644
--- a/sys-apps/s6/s6-2.11.1.1.ebuild
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -12,12 +12,10 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+execline static static-libs"
+IUSE="+execline"
 
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="dev-libs/skalibs:=[static-libs?]
-   execline? ( dev-lang/execline:=[static-libs?] )
+RDEPEND="dev-libs/skalibs:=
+   execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -44,9 +42,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
$(use_enable execline)
)

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

2022-06-24 Thread Sam James

commit: ab67779a229abc61f9812bd2d015d2b7ed588822
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Jun 16 13:44:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 05:35:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab67779a

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

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

 sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild | 14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
index 35dea1d4a721..9304b3decb02 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -12,13 +12,10 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
 
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="dev-lang/execline:=[static-libs?]
-   dev-libs/skalibs:=[static-libs?]
-   sys-apps/s6:=[execline,static-libs?]
+RDEPEND="dev-lang/execline:=
+   dev-libs/skalibs:=
+   sys-apps/s6:=[execline]
 "
 DEPEND="${RDEPEND}"
 
@@ -46,9 +43,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[@]}"

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

2022-06-24 Thread Sam James

commit: 64b04989632f45cf9205ec1b7dac8fea10315322
Author: Petr Vaněk  atlas  cz>
AuthorDate: Tue Jun 14 21:18:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 05:35:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b04989

sys-apps/s6-rc: add 0.5.3.2

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

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 02ff2c9df2b7..0e557733c2b1 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1,3 @@
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 
8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1
 SHA512 
0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 
6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63
 SHA512 
1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
+DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051

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

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

2022-06-24 Thread Agostino Sarubbo

commit: 1aadf0c03c53a9f384bf8b6f281c8c105bc441a0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:11:10 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:11:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aadf0c0

sys-apps/s6-rc: x86 stable wrt bug #853934

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
index 89cd3055a2d4..6feff233b4ae 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.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"
 
 REQUIRED_USE="static? ( static-libs )"

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

2022-06-24 Thread Agostino Sarubbo

commit: 0030e9ae11e6a5e51afe658afaa1179ad5109be1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:06:56 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:06:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0030e9ae

sys-apps/s6-rc: amd64 stable wrt bug #853934

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
index bc3b886ef52a..89cd3055a2d4 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.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"
 
 REQUIRED_USE="static? ( static-libs )"

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

2022-05-24 Thread Joonas Niilola

commit: 5d50922ce1212c50f9249c28d51715ebb04e72a1
Author: Petr Vaněk  atlas  cz>
AuthorDate: Fri May 20 14:40:04 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 24 06:57:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d50922c

sys-apps/s6-rc: drop 0.5.2.0

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

 sys-apps/s6-rc/Manifest |  1 -
 sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild | 59 -
 2 files changed, 60 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 42c608ebf407..02ff2c9df2b7 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,2 @@
-DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 
9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8
 SHA512 
663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 
8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1
 SHA512 
0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 
6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63
 SHA512 
1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9

diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
deleted file mode 100644
index 88fb3dd4c768..
--- a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="

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

2022-05-24 Thread Joonas Niilola

commit: 6d15da237578440673e352b7dfcfc6c0ac4b607b
Author: Petr Vaněk  atlas  cz>
AuthorDate: Fri May 20 14:38:17 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 24 06:57:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d15da23

sys-apps/s6-rc: add 0.5.3.1

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

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index dc7211859c85..42c608ebf407 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1,3 @@
 DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 
9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8
 SHA512 
663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 
8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1
 SHA512 
0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
+DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 
6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63
 SHA512 
1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
new file mode 100644
index ..bc3b886ef52a
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+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?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir=/usr/$(get_libdir)
+   --libdir=/usr/$(get_libdir)/${PN}
+   --with-dynlib=/usr/$(get_libdir)
+   --with-lib=/usr/$(get_libdir)/execline
+   --with-lib=/usr/$(get_libdir)/s6
+   --with-lib=/usr/$(get_libdir)/skalibs
+   --with-sysdeps=/usr/$(get_libdir)/skalibs
+   --enable-shared
+   $(use_enable static allstatic)
+   $(use_enable static static-libc)
+   $(use_enable static-libs static)
+   )
+
+   econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2022-04-24 Thread Joonas Niilola

commit: 21cb5710bb741b273b77adab4c091a953b957fd3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Apr 24 09:49:09 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Apr 24 09:49:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21cb5710

sys-apps/s6-rc: Stabilize 0.5.3.0 amd64, #834437

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

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

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
index 4f20f1c0aa33..6feff233b4ae 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

2022-03-10 Thread Jakov Smolić

commit: a87a043aa8361229e6219cf757b8a00c65d935e2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar 10 09:48:00 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar 10 09:48:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87a043a

sys-apps/s6-rc: Stabilize 0.5.3.0 x86, #834437

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

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

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
index bc3b886ef52a..4f20f1c0aa33 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/, net-dns/s6-dns/, sys-apps/s6/, net-misc/s6-networking/, ...

2022-01-28 Thread Sam James

commit: 10f043bab12f29854689692a70cf42cee834fc01
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Jan 26 15:25:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 28 07:59:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f043ba

*/*: limit dependencies for older versions of skarnet software

Multiple incompatible changes were presented in
dev-libs/skalibs-2.10.0.0 and sys-apps/s6-2.10.0.0, therefore it is
necessary to limit dependencies correctly for older ebuilds.

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

 dev-lang/execline/execline-2.6.1.1.ebuild   |  2 +-
 net-dns/s6-dns/s6-dns-2.3.3.0.ebuild|  2 +-
 net-misc/s6-networking/s6-networking-2.3.2.0.ebuild | 10 +-
 sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild |  6 +++---
 sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild   |  4 ++--
 sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild |  4 ++--
 sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild |  6 +++---
 sys-apps/s6/s6-2.9.2.0.ebuild   |  4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev-lang/execline/execline-2.6.1.1.ebuild 
b/dev-lang/execline/execline-2.6.1.1.ebuild
index 26c92c8e38af..83a8194344ff 100644
--- a/dev-lang/execline/execline-2.6.1.1.ebuild
+++ b/dev-lang/execline/execline-2.6.1.1.ebuild
@@ -16,7 +16,7 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-libs/skalibs-2.9.3.0:=[static-libs?]"
+RDEPEND="=net-dns/s6-dns-2.3.3.0:=
+

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

2022-01-28 Thread Sam James

commit: ca28a27a81a6fc1e71a281942a537c1720a48172
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Jan 23 11:49:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 28 07:59:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca28a27a

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

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

 sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
index 6f0a3d47a42a..d260c7317805 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.2.0.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="Service manager for the s6 supervision suite"
 HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
@@ -28,9 +30,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) \

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

2022-01-28 Thread Sam James

commit: 5cb1ac128aa292e301891ac05cff45e3fd57128e
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Jan 23 15:52:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 28 07:59:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb1ac12

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

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

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

diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 3c6c082ed21d..aed39d3983af 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -9,4 +9,12 @@
willi...@gentoo.org
William Hubbs

+   
+   arka...@atlas.cz
+   Petr Vaněk
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+

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

2022-01-28 Thread Sam James

commit: bcc147eeeadc989a6c7a1c58d549b4b263a9aa9d
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Jan 23 11:54:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 28 07:59:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc147ee

sys-apps/s6-rc: add 0.5.3.0

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

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

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 2c5369997455..dc7211859c85 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1 +1,2 @@
 DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 
9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8
 SHA512 
663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
+DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 
8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1
 SHA512 
0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
new file mode 100644
index ..bc3b886ef52a
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+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?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir=/usr/$(get_libdir)
+   --libdir=/usr/$(get_libdir)/${PN}
+   --with-dynlib=/usr/$(get_libdir)
+   --with-lib=/usr/$(get_libdir)/execline
+   --with-lib=/usr/$(get_libdir)/s6
+   --with-lib=/usr/$(get_libdir)/skalibs
+   --with-sysdeps=/usr/$(get_libdir)/skalibs
+   --enable-shared
+   $(use_enable static allstatic)
+   $(use_enable static static-libc)
+   $(use_enable static-libs static)
+   )
+
+   econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2020-10-11 Thread William Hubbs

commit: 21f11a4934617225fa765523454d7f0c49638304
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Oct 11 16:47:10 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun Oct 11 17:48:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f11a49

sys-apps/s6-rc: 0.5.2.0 bump

Signed-off-by: William Hubbs  gentoo.org>

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 36636aa0e7f..abf572fba23 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,3 +4,4 @@ DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B 
fe6aa6e2ed868cca6d76928571d561784012ded4
 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 
07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89
 SHA512 
12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
 DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 
5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7
 SHA512 
3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18
 DIST s6-rc-0.5.1.1.tar.gz 97648 BLAKE2B 
9c5363fafe19b970e61d5b6bdef1880b1085f4fea67c55485b6dc5c12ce857dd8828cdedd6880808fdb6d664af63ccac1884262f337b12f2a2ea4b2392016aea
 SHA512 
88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772
+DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 
9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8
 SHA512 
663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5

diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
new file mode 100644
index 000..6f0a3d47a42
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
+   >=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+   >=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition; avoid overriding 
-fstack-protector
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' 
\
+   configure || die
+}
+
+src_configure() {
+   econf \
+   --bindir=/bin \
+   --dynlibdir=/usr/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/usr/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/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)
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2020-07-15 Thread Sam James

commit: 6962fc5a410f4806c608d51f2ace59b81d07dafa
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 15 12:28:50 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 15 12:30:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6962fc5a

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

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

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

diff --git a/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
index bef467c011f..80578304da7 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.1.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"
 
 REQUIRED_USE="static? ( static-libs )"

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

2020-05-16 Thread Joonas Niilola

commit: ee6a5c3a704e395dfe3a93258db32291a5b0cf8e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat May 16 07:03:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 16 07:03:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6a5c3a

sys-apps/s6-rc: remove p-m

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

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

diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index ed6e85cfdb1..c36c37139fa 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -1,16 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   sam...@sholland.org
-   Samuel Holland
-   

willi...@gentoo.org
William Hubbs

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-

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

2019-11-28 Thread William Hubbs

commit: 7a14329d0d5d38475dbd2faa6fd1112467438fbd
Author: William Hubbs  gentoo  org>
AuthorDate: Thu Nov 28 21:39:41 2019 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Nov 28 21:54:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a14329d

sys-apps/s6-rc: 0.5.1.1 bump

Closes: https://bugs.gentoo.org/696700
Signed-off-by: William Hubbs  gentoo.org>

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 95c1738fa0f..36636aa0e7f 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -3,3 +3,4 @@ DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B 
fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23
 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B 
fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088
 SHA512 
f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 
07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89
 SHA512 
12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
 DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 
5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7
 SHA512 
3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18
+DIST s6-rc-0.5.1.1.tar.gz 97648 BLAKE2B 
9c5363fafe19b970e61d5b6bdef1880b1085f4fea67c55485b6dc5c12ce857dd8828cdedd6880808fdb6d664af63ccac1884262f337b12f2a2ea4b2392016aea
 SHA512 
88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772

diff --git a/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
new file mode 100644
index 000..bef467c011f
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+   >=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+   >=sys-apps/s6-2.9.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) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/usr/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   --enable-shared \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2019-06-22 Thread Michał Górny

commit: 14d93ff778b4038b4d5e32e640d5dac10b7ee590
Author: Samuel Holland  sholland  org>
AuthorDate: Sun May 19 23:31:32 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jun 22 07:32:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d93ff7

sys-apps/s6-rc: Version bump to 0.5.0.0

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

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 3534d166438..95c1738fa0f 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -2,3 +2,4 @@ DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 
0096fe268393192867b1e2d45f9a46c0a7618478
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B 
fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83
 SHA512 
81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B 
fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088
 SHA512 
f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 
07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89
 SHA512 
12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
+DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 
5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7
 SHA512 
3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18

diff --git a/sys-apps/s6-rc/s6-rc-0.5.0.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.0.0.ebuild
new file mode 100644
index 000..6830fe022a5
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
+   >=dev-libs/skalibs-2.8.0.0:=[static-libs?]
+   >=sys-apps/s6-2.8.0.0:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition; avoid overriding 
-fstack-protector
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' 
\
+   configure || die
+}
+
+src_configure() {
+   econf \
+   --bindir=/bin \
+   --dynlibdir=/usr/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/usr/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/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)
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2018-10-08 Thread Georgy Yakovlev

commit: 051b4fcac808821f0254d4d318360b1482c72949
Author: Luis Ressel  aixah  de>
AuthorDate: Wed Aug 22 21:37:26 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Oct  9 00:11:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051b4fca

sys-apps/s6-rc: Bump to 0.4.1.0

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

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

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 8632670f2c3..3534d166438 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,4 @@
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 
0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497
 SHA512 
d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B 
fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83
 SHA512 
81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B 
fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088
 SHA512 
f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
+DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 
07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89
 SHA512 
12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92

diff --git a/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild
new file mode 100644
index 000..9074e87b722
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
+   >=sys-apps/s6-2.7.2.0[static-libs?]
+   >=dev-libs/skalibs-2.7.0.0[static-libs?]
+"
+RDEPEND=">=dev-lang/execline-2.5.0.1:=
+   >=sys-apps/s6-2.7.2.0:=
+   !static? ( >=dev-libs/skalibs-2.7.0.0:= )
+"
+
+DOCS="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 -fno-stack-protector$/d" "${S}/configure" || 
die
+}
+
+src_configure() {
+   econf \
+   --bindir=/bin \
+   --dynlibdir=/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/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)
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EPREFIX}/usr/share/doc/${P}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2018-10-02 Thread Michał Górny

commit: c4549a4cce9df8aab1e87309f5ca578ec99a335e
Author: Luis Ressel  aixah  de>
AuthorDate: Tue Oct  2 21:23:53 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Oct  2 22:08:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4549a4c

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

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

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

diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 96c083c9b37..34f39bd4b28 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -13,4 +13,8 @@
willi...@gentoo.org
William Hubbs

+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+

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

2018-05-31 Thread William Hubbs

commit: 630600115b1fb6205b91e332d206e817b8fcb3cb
Author: Samuel Holland  sholland  org>
AuthorDate: Fri Mar 30 03:25:33 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu May 31 22:48:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63060011

sys-apps/s6-rc: 0.4.0.1 version bump

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 780e0021ada..8632670f2c3 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1,3 @@
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 
0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497
 SHA512 
d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B 
fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83
 SHA512 
81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
+DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B 
fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088
 SHA512 
f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7

diff --git a/sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild
new file mode 100644
index 000..ab1ba2e9f5a
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.3.0.4[static-libs]
+   >=dev-libs/skalibs-2.6.4.0[static-libs]
+   >=sys-apps/s6-2.7.1.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.3.0.4[static=]
+   >=dev-libs/skalibs-2.6.4.0
+   >=sys-apps/s6-2.7.1.0[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.3.0.4:=[!static?]
+   >=sys-apps/s6-2.7.1.0:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.6.4.0:=
+   )
+"
+
+DOCS="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 -fno-stack-protector$/d" "${S}/configure" || 
die
+}
+
+src_configure() {
+   econf \
+   --bindir=/bin \
+   --dynlibdir=/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EPREFIX}/usr/share/doc/${P}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2018-03-29 Thread William Hubbs

commit: f935e561b71bf775669982826f6c802b06cd6f08
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Nov 16 00:52:59 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Mar 29 13:24:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f935e561

sys-apps/s6-rc: Clean up old versions

 sys-apps/s6-rc/Manifest |  6 
 sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild | 60 --
 sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild | 60 --
 sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild | 61 ---
 sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild | 61 ---
 sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild | 64 -
 sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild | 64 -
 7 files changed, 376 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index d492f406609..780e0021ada 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,8 +1,2 @@
-DIST s6-rc-0.0.2.1.tar.gz 85549 BLAKE2B 
6418b2357d721ea950d935d5b10c19b2a0fd975207283a99e8b49cd6deba0c209af8895c093821ffb76be30de3e73ae686d34f7b95641ceaa2f2b9a8d04e3351
 SHA512 
9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c
-DIST s6-rc-0.0.3.0.tar.gz 86992 BLAKE2B 
b37239f9de164257813c33556c07d387c580107e0f8309b3d24d1d49580e19b3398c5ffb05fcbaeee21453e3ac967004812947437cd7a7acf1b74af0401129d1
 SHA512 
66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325
-DIST s6-rc-0.1.0.0.tar.gz 88520 BLAKE2B 
c0c117b96085316d7a3df6690788ea3f29ccdc1dc2b46c19b08735f0662dfc635d5ff823d0d27bb9efdbae806d7e6958140f45edf136bb7c2b9c368404634f21
 SHA512 
d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe
-DIST s6-rc-0.2.0.0.tar.gz 90133 BLAKE2B 
2168ecdc28c38673bdf71e73391f6253332da6eb7abbdaac728579eabfa47adb6ba3a978228cef44f63d14e3c224a3d2988f35f1f43805925a461d32198d93b7
 SHA512 
981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636
-DIST s6-rc-0.2.0.1.tar.gz 90345 BLAKE2B 
df5516e49ca3852a8046190d335dba74e20c5d106aca03d81010e41b3a8b56893d1f3339d9188211c009d1e77461fa1d6bce91cd8f1070e93209da59ac898f27
 SHA512 
d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
-DIST s6-rc-0.2.1.2.tar.gz 90978 BLAKE2B 
f237704f2ce8ac00ba4b46bbc0bbfe2066592604abadf6c9a518ee9da5dae056b0467c3ddb215c40a647b726beaf5e7da3cb282c45ac66bab7fc4a09558c9fed
 SHA512 
33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 
0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497
 SHA512 
d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B 
fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83
 SHA512 
81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21

diff --git a/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild
deleted file mode 100644
index dd910dc1ab2..000
--- a/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="http://www.skarnet.org/software/s6-rc/;
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND="
-   static? (
-   >=dev-lang/execline-2.1.4.5[static-libs]
-   >=dev-libs/skalibs-2.3.8.3[static-libs]
-   >=sys-apps/s6-2.2.4.2[static-libs]
-   )
-   !static? (
-   >=dev-lang/execline-2.1.4.5
-   >=dev-libs/skalibs-2.3.8.3
-   >=sys-apps/s6-2.2.4.2
-   )
-   "
-RDEPEND="
-   !static? (
-   >=dev-lang/execline-2.1.4.5
-   >=dev-libs/skalibs-2.3.8.3
-   >=sys-apps/s6-2.2.4.2
-   )
-   "
-
-DOCS=("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) \
-

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

2018-01-10 Thread William Hubbs

commit: da884271f3876ed75fb975356783a2ded1ea286d
Author: Samuel Holland  sholland  org>
AuthorDate: Wed Jan 10 08:20:23 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jan 10 21:34:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da884271

sys-apps/s6-rc: 0.4.0.0 version bump

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 6489c199695..d492f406609 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -5,3 +5,4 @@ DIST s6-rc-0.2.0.0.tar.gz 90133 BLAKE2B 
2168ecdc28c38673bdf71e73391f6253332da6eb
 DIST s6-rc-0.2.0.1.tar.gz 90345 BLAKE2B 
df5516e49ca3852a8046190d335dba74e20c5d106aca03d81010e41b3a8b56893d1f3339d9188211c009d1e77461fa1d6bce91cd8f1070e93209da59ac898f27
 SHA512 
d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
 DIST s6-rc-0.2.1.2.tar.gz 90978 BLAKE2B 
f237704f2ce8ac00ba4b46bbc0bbfe2066592604abadf6c9a518ee9da5dae056b0467c3ddb215c40a647b726beaf5e7da3cb282c45ac66bab7fc4a09558c9fed
 SHA512 
33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 
0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497
 SHA512 
d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
+DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B 
fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83
 SHA512 
81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21

diff --git a/sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild
new file mode 100644
index 000..c8b064ee565
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.3.0.4[static-libs]
+   >=dev-libs/skalibs-2.6.3.0[static-libs]
+   >=sys-apps/s6-2.6.2.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.3.0.4[static=]
+   >=dev-libs/skalibs-2.6.3.0
+   >=sys-apps/s6-2.6.2.0[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.3.0.4:=[!static?]
+   >=sys-apps/s6-2.6.2.0:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.6.3.0:=
+   )
+"
+
+DOCS="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 -fno-stack-protector$/d" "${S}/configure" || 
die
+}
+
+src_configure() {
+   econf \
+   --bindir=/bin \
+   --dynlibdir=/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}
+
+pkg_postinst() {
+   ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually 
upgraded!"
+   ewarn "See the upgrade notes at 
${EPREFIX}/usr/share/doc/${P}/html/upgrade.html"
+   ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}

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

2017-11-15 Thread William Hubbs

commit: 798943844d6f399872365576a4ff9f89d8970e84
Author: Luis Ressel  aixah  de>
AuthorDate: Wed Nov 15 20:05:47 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Nov 15 20:07:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79894384

sys-apps/s6-rc: Bump to 0.3.0.0

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 96b090f8ff7..b1ce7d8925c 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,3 +4,4 @@ DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 
d04a8a765740ed55e38a33da3639197f51f83b3e4
 DIST s6-rc-0.2.0.0.tar.gz 90133 SHA256 
b83a4f15ba0e13f935c7e4db8ef17229388e1fb4ca4e553b817ad039427404a5 SHA512 
981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636
 WHIRLPOOL 
297b7cfb73f480ee5e419197a13a7462849ee948f5445c29b1c0da31ad1d3eb2206afc1cccafb8a489f472ed8853298ff89662dedc57f69e4a95a6e2beaacaab
 DIST s6-rc-0.2.0.1.tar.gz 90345 SHA256 
8b01d5b4c2380c6b30d320118b9a9b9ca174a25ed3c75afe8f59a4e840847a76 SHA512 
d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
 WHIRLPOOL 
dbfa8c726db19a87b1271c311a514ac71803ac4c66e5d1947785177d0825214630e4a149f21679c6126bcec966dcc3390688ee2b654003e34d29a11c06edb7da
 DIST s6-rc-0.2.1.2.tar.gz 90978 SHA256 
4fa35cf8af41498c9fa0c21220dcdc7595a18ebc2975a254d719f7e1c864b1f0 SHA512 
33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f
 WHIRLPOOL 
89aa08ffd5f8073f506d7fb302f1e2363501f35248531cafb389aef092a3b3e6a1da202a320cecd927e0da9dc85e35c1def6dfd8505742fc428ebaed2257e916
+DIST s6-rc-0.3.0.0.tar.gz 93183 SHA256 
78266a397330d35d5eac9e99d1436feba58e36f41bfe1db0fd16c4b6cc73c999 SHA512 
d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 WHIRLPOOL 
0ecb9e8edbf9e0b6fbef963b0a07ef7f2229540d7ec63b99dad5d50f52aaff75c93d695e2d34ede26412d7f1bed6a375f203158d51e82a332cb207f5de7e2b50

diff --git a/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
new file mode 100644
index 000..9d30ce768b8
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.3.0.3[static-libs]
+   >=dev-libs/skalibs-2.6.0.1[static-libs]
+   >=sys-apps/s6-2.6.1.1[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.3.0.3[static=]
+   >=dev-libs/skalibs-2.6.0.1
+   >=sys-apps/s6-2.6.1.1[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.3.0.3:=[!static?]
+   >=sys-apps/s6-2.6.1.1:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.6.0.1:=
+   )
+"
+
+DOCS="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 -fno-stack-protector$/d" "${S}/configure" || 
die
+}
+
+src_configure() {
+   econf \
+   --bindir=/bin \
+   --dynlibdir=/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/$(get_libdir) \
+   --with-lib=/usr/$(get_libdir)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}

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

2017-10-03 Thread William Hubbs

commit: 7ec271537c526bce2ed74ea1730869bfb65f1c13
Author: Samuel Holland  sholland  org>
AuthorDate: Tue Oct  3 18:35:37 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  3 18:43:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec27153

sys-apps/s6-rc: 0.2.1.2 version bump

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index c28e83dcb20..96b090f8ff7 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -3,3 +3,4 @@ DIST s6-rc-0.0.3.0.tar.gz 86992 SHA256 
5eb94e77961a075e6305e89e3a5c7e6c95fb70376
 DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 
d04a8a765740ed55e38a33da3639197f51f83b3e498bdef5bc1d1d322b1acff3 SHA512 
d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe
 WHIRLPOOL 
afac5177ca5220551575036e27b0881fe78712de93ef48e88158abf2c49a7494c47bebe58f48aec8b412a7e2075d29284f57514fe81d2b42b35cd441ff08e13e
 DIST s6-rc-0.2.0.0.tar.gz 90133 SHA256 
b83a4f15ba0e13f935c7e4db8ef17229388e1fb4ca4e553b817ad039427404a5 SHA512 
981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636
 WHIRLPOOL 
297b7cfb73f480ee5e419197a13a7462849ee948f5445c29b1c0da31ad1d3eb2206afc1cccafb8a489f472ed8853298ff89662dedc57f69e4a95a6e2beaacaab
 DIST s6-rc-0.2.0.1.tar.gz 90345 SHA256 
8b01d5b4c2380c6b30d320118b9a9b9ca174a25ed3c75afe8f59a4e840847a76 SHA512 
d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
 WHIRLPOOL 
dbfa8c726db19a87b1271c311a514ac71803ac4c66e5d1947785177d0825214630e4a149f21679c6126bcec966dcc3390688ee2b654003e34d29a11c06edb7da
+DIST s6-rc-0.2.1.2.tar.gz 90978 SHA256 
4fa35cf8af41498c9fa0c21220dcdc7595a18ebc2975a254d719f7e1c864b1f0 SHA512 
33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f
 WHIRLPOOL 
89aa08ffd5f8073f506d7fb302f1e2363501f35248531cafb389aef092a3b3e6a1da202a320cecd927e0da9dc85e35c1def6dfd8505742fc428ebaed2257e916

diff --git a/sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild
new file mode 100644
index 000..e3e6bf37f0a
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.3.0.2[static-libs]
+   >=dev-libs/skalibs-2.6.0.0[static-libs]
+   >=sys-apps/s6-2.6.1.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.3.0.2[static=]
+   >=dev-libs/skalibs-2.6.0.0
+   >=sys-apps/s6-2.6.1.0[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.3.0.2:=[!static?]
+   >=sys-apps/s6-2.6.1.0:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.6.0.0:=
+   )
+"
+
+DOCS="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)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}

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

2017-05-21 Thread William Hubbs

commit: 20a23b62b4650e1972d1f5e6513cddb9bab2832b
Author: Luis Ressel  aixah  de>
AuthorDate: Sun May 21 15:33:17 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun May 21 21:09:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a23b62

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

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

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 276fbcb15f2..c28e83dcb20 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -2,3 +2,4 @@ DIST s6-rc-0.0.2.1.tar.gz 85549 SHA256 
93f30557e2e2e5c507b5becef2bd26f377be6b6c5
 DIST s6-rc-0.0.3.0.tar.gz 86992 SHA256 
5eb94e77961a075e6305e89e3a5c7e6c95fb7037682d4ea45277c1ab1625892e SHA512 
66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325
 WHIRLPOOL 
54c1bddc6254eadf428806920f9cdf567cbb77d4496d7b8afd2b9c9daee5159719160a63f2ef257eb6bc86726161356864df070a80ed8acb3d3f7e0c8c748518
 DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 
d04a8a765740ed55e38a33da3639197f51f83b3e498bdef5bc1d1d322b1acff3 SHA512 
d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe
 WHIRLPOOL 
afac5177ca5220551575036e27b0881fe78712de93ef48e88158abf2c49a7494c47bebe58f48aec8b412a7e2075d29284f57514fe81d2b42b35cd441ff08e13e
 DIST s6-rc-0.2.0.0.tar.gz 90133 SHA256 
b83a4f15ba0e13f935c7e4db8ef17229388e1fb4ca4e553b817ad039427404a5 SHA512 
981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636
 WHIRLPOOL 
297b7cfb73f480ee5e419197a13a7462849ee948f5445c29b1c0da31ad1d3eb2206afc1cccafb8a489f472ed8853298ff89662dedc57f69e4a95a6e2beaacaab
+DIST s6-rc-0.2.0.1.tar.gz 90345 SHA256 
8b01d5b4c2380c6b30d320118b9a9b9ca174a25ed3c75afe8f59a4e840847a76 SHA512 
d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
 WHIRLPOOL 
dbfa8c726db19a87b1271c311a514ac71803ac4c66e5d1947785177d0825214630e4a149f21679c6126bcec966dcc3390688ee2b654003e34d29a11c06edb7da

diff --git a/sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild
new file mode 100644
index 000..4c43b7e5cd1
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.3.0.1[static-libs]
+   >=dev-libs/skalibs-2.5.1.0[static-libs]
+   >=sys-apps/s6-2.5.1.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.3.0.1[static=]
+   >=dev-libs/skalibs-2.5.1.0
+   >=sys-apps/s6-2.5.1.0[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.3.0.1:=[!static?]
+   >=sys-apps/s6-2.5.1.0:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.5.1.0:=
+   )
+"
+
+DOCS="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)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}

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

2017-04-26 Thread William Hubbs

commit: d4ab0bc2fb39a9edb0329e5a7538a9bd5eb01fc8
Author: Samuel Holland  sholland  org>
AuthorDate: Wed Apr 26 21:26:41 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Apr 26 21:28:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ab0bc2

sys-apps/s6-rc: 0.2.0.0 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index fb9315c2571..276fbcb15f2 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,4 @@
 DIST s6-rc-0.0.2.1.tar.gz 85549 SHA256 
93f30557e2e2e5c507b5becef2bd26f377be6b6c542fb4627c3122e1c2d83ef9 SHA512 
9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c
 WHIRLPOOL 
f10e515db0106816fb3c79c46dea0f171ac89653f326b9287aeccb1a9cc369fb6e6fec40c43eb3c3863763081608ec7cccf780cb8bcaaee7303e6c5d106c082d
 DIST s6-rc-0.0.3.0.tar.gz 86992 SHA256 
5eb94e77961a075e6305e89e3a5c7e6c95fb7037682d4ea45277c1ab1625892e SHA512 
66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325
 WHIRLPOOL 
54c1bddc6254eadf428806920f9cdf567cbb77d4496d7b8afd2b9c9daee5159719160a63f2ef257eb6bc86726161356864df070a80ed8acb3d3f7e0c8c748518
 DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 
d04a8a765740ed55e38a33da3639197f51f83b3e498bdef5bc1d1d322b1acff3 SHA512 
d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe
 WHIRLPOOL 
afac5177ca5220551575036e27b0881fe78712de93ef48e88158abf2c49a7494c47bebe58f48aec8b412a7e2075d29284f57514fe81d2b42b35cd441ff08e13e
+DIST s6-rc-0.2.0.0.tar.gz 90133 SHA256 
b83a4f15ba0e13f935c7e4db8ef17229388e1fb4ca4e553b817ad039427404a5 SHA512 
981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636
 WHIRLPOOL 
297b7cfb73f480ee5e419197a13a7462849ee948f5445c29b1c0da31ad1d3eb2206afc1cccafb8a489f472ed8853298ff89662dedc57f69e4a95a6e2beaacaab

diff --git a/sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild
new file mode 100644
index 000..0e7c6f01fd3
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.3.0.0[static-libs]
+   >=dev-libs/skalibs-2.5.0.0[static-libs]
+   >=sys-apps/s6-2.5.0.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.3.0.0[static=]
+   >=dev-libs/skalibs-2.5.0.0
+   >=sys-apps/s6-2.5.0.0[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.3.0.0:=[!static?]
+   >=sys-apps/s6-2.5.0.0:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.5.0.0:=
+   )
+"
+
+DOCS="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)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}

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

2017-01-11 Thread William Hubbs

commit: 29f1b5749543aa9315dbbc620cd79194137074ab
Author: Samuel Holland  sholland  org>
AuthorDate: Mon Jan  9 21:42:22 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jan 11 23:33:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f1b574

sys-apps/s6-rc: 0.1.0.0 version bump

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

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/metadata.xml |  4 +++
 sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild | 62 +
 3 files changed, 67 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 76f0862..fb9315c 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1,3 @@
 DIST s6-rc-0.0.2.1.tar.gz 85549 SHA256 
93f30557e2e2e5c507b5becef2bd26f377be6b6c542fb4627c3122e1c2d83ef9 SHA512 
9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c
 WHIRLPOOL 
f10e515db0106816fb3c79c46dea0f171ac89653f326b9287aeccb1a9cc369fb6e6fec40c43eb3c3863763081608ec7cccf780cb8bcaaee7303e6c5d106c082d
 DIST s6-rc-0.0.3.0.tar.gz 86992 SHA256 
5eb94e77961a075e6305e89e3a5c7e6c95fb7037682d4ea45277c1ab1625892e SHA512 
66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325
 WHIRLPOOL 
54c1bddc6254eadf428806920f9cdf567cbb77d4496d7b8afd2b9c9daee5159719160a63f2ef257eb6bc86726161356864df070a80ed8acb3d3f7e0c8c748518
+DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 
d04a8a765740ed55e38a33da3639197f51f83b3e498bdef5bc1d1d322b1acff3 SHA512 
d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe
 WHIRLPOOL 
afac5177ca5220551575036e27b0881fe78712de93ef48e88158abf2c49a7494c47bebe58f48aec8b412a7e2075d29284f57514fe81d2b42b35cd441ff08e13e

diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 7ac867b..1bf18c1 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -7,6 +7,10 @@
Proxied maintainer; set to assignee in all 
bugs


+   sam...@sholland.org
+   Samuel Holland
+   
+   
willi...@gentoo.org
William Hubbs


diff --git a/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild
new file mode 100644
index ..a1ccd43
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="http://www.skarnet.org/software/s6-rc/;
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+   static? (
+   >=dev-lang/execline-2.2.0.0[static-libs]
+   >=dev-libs/skalibs-2.4.0.0[static-libs]
+   >=sys-apps/s6-2.4.0.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.2.0.0[static=]
+   >=dev-libs/skalibs-2.4.0.0
+   >=sys-apps/s6-2.4.0.0[static=]
+   )
+"
+RDEPEND="
+   >=dev-lang/execline-2.2.0.0:=[!static?]
+   >=sys-apps/s6-2.4.0.0:=[!static?]
+   !static? (
+   >=dev-libs/skalibs-2.4.0.0:=
+   )
+"
+
+DOCS="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)/execline \
+   --with-lib=/usr/$(get_libdir)/s6 \
+   --with-lib=/usr/$(get_libdir)/skalibs \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs \
+   $(use_enable !static shared) \
+   $(use_enable static allstatic) \
+   $(use_enable static static-libc) \
+   $(use_enable static-libs static)
+}

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

2016-06-29 Thread William Hubbs

commit: f29f0174faefef9e97642735885d5c1a68883017
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Jun 29 17:06:50 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jun 29 17:35:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f29f0174

sys-apps/s6-rc: 0.0.3.0 version bump

Package-Manager: portage-2.2.28

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index bdda592..76f0862 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1 +1,2 @@
 DIST s6-rc-0.0.2.1.tar.gz 85549 SHA256 
93f30557e2e2e5c507b5becef2bd26f377be6b6c542fb4627c3122e1c2d83ef9 SHA512 
9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c
 WHIRLPOOL 
f10e515db0106816fb3c79c46dea0f171ac89653f326b9287aeccb1a9cc369fb6e6fec40c43eb3c3863763081608ec7cccf780cb8bcaaee7303e6c5d106c082d
+DIST s6-rc-0.0.3.0.tar.gz 86992 SHA256 
5eb94e77961a075e6305e89e3a5c7e6c95fb7037682d4ea45277c1ab1625892e SHA512 
66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325
 WHIRLPOOL 
54c1bddc6254eadf428806920f9cdf567cbb77d4496d7b8afd2b9c9daee5159719160a63f2ef257eb6bc86726161356864df070a80ed8acb3d3f7e0c8c748518

diff --git a/sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild
new file mode 100644
index 000..3d78816
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="http://www.skarnet.org/software/s6-rc/;
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND="
+   static? (
+   >=dev-lang/execline-2.1.5.0[static-libs]
+   >=dev-libs/skalibs-2.3.10.0[static-libs]
+   >=sys-apps/s6-2.3.0.0[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.1.5.0
+   >=dev-libs/skalibs-2.3.10.0
+   >=sys-apps/s6-2.3.0.0
+   )
+   "
+RDEPEND="
+   !static? (
+   >=dev-lang/execline-2.1.5.0
+   >=dev-libs/skalibs-2.3.10.0
+   >=sys-apps/s6-2.3.0.0
+   )
+   "
+
+DOCS=("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-libs static) \
+   $(use_enable static allstatic) \
+   --bindir=/bin \
+   --sbindir=/sbin \
+   --dynlibdir=/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --datadir=/etc \
+   --sysdepdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/$(get_libdir) \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs
+}

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

2016-03-19 Thread William Hubbs

commit: 67f04c78a3188a99bacb63e6cc261d67971b1888
Author: Luis Ressel  aixah  de>
AuthorDate: Sun Mar  6 23:08:21 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sat Mar 19 23:12:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f04c78

sys-apps/s6-rc: New package

s6-rc is a service manager based on the sys-apps/s6 supervision suite.

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/metadata.xml | 13 
 sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild | 61 +
 3 files changed, 75 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
new file mode 100644
index 000..bdda592
--- /dev/null
+++ b/sys-apps/s6-rc/Manifest
@@ -0,0 +1 @@
+DIST s6-rc-0.0.2.1.tar.gz 85549 SHA256 
93f30557e2e2e5c507b5becef2bd26f377be6b6c542fb4627c3122e1c2d83ef9 SHA512 
9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c
 WHIRLPOOL 
f10e515db0106816fb3c79c46dea0f171ac89653f326b9287aeccb1a9cc369fb6e6fec40c43eb3c3863763081608ec7cccf780cb8bcaaee7303e6c5d106c082d

diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
new file mode 100644
index 000..7ac867b
--- /dev/null
+++ b/sys-apps/s6-rc/metadata.xml
@@ -0,0 +1,13 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ara...@aixah.de
+   Luis Ressel
+   Proxied maintainer; set to assignee in all 
bugs
+   
+   
+   willi...@gentoo.org
+   William Hubbs
+   
+

diff --git a/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild
new file mode 100644
index 000..0a0e0d0
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="http://www.skarnet.org/software/s6-rc/;
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND="
+   static? (
+   >=dev-lang/execline-2.1.4.5[static-libs]
+   >=dev-libs/skalibs-2.3.8.3[static-libs]
+   >=sys-apps/s6-2.2.4.2[static-libs]
+   )
+   !static? (
+   >=dev-lang/execline-2.1.4.5
+   >=dev-libs/skalibs-2.3.8.3
+   >=sys-apps/s6-2.2.4.2
+   )
+   "
+RDEPEND="
+   !static? (
+   >=dev-lang/execline-2.1.4.5
+   >=dev-libs/skalibs-2.3.8.3
+   >=sys-apps/s6-2.2.4.2
+   )
+   "
+
+DOCS=("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-libs static) \
+   $(use_enable static allstatic) \
+   --bindir=/bin \
+   --sbindir=/sbin \
+   --dynlibdir=/$(get_libdir) \
+   --libdir=/usr/$(get_libdir)/${PN} \
+   --datadir=/etc \
+   --sysdepdir=/usr/$(get_libdir)/${PN} \
+   --with-dynlib=/$(get_libdir) \
+   --with-sysdeps=/usr/$(get_libdir)/skalibs
+}

52 matches

Mail list logo