gentoo auto-resync : 17:11:2023 - 16:57:03

3 files changed, 58 insertions, 2 deletions

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 6c8ff58c97cf..cf29a9190e51 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22 SHA512 fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
-EBUILD s6-2.11.3.2.ebuild 1184 BLAKE2B 3a7f6160c952ec46c2645fcdd3357ede7700cc04d45b004785874b3e0f75486c77fe43bbc2e86005f167a1180c5b8b28cdbc8ed3aded60b3c2abad17d7a47244 SHA512 7b6e50b8d659363e2bf44e56ffce6c2db3d23f12ad2ad96ae299f0b0f52bac261fddb685d272853bf94efecc407874c1d84d780c9ee3dd522f367f0cc6d756bb
+DIST s6-2.12.0.0.tar.gz 255678 BLAKE2B cee3bccbdfb8dee8e38ad2757ed650dea5e940835df463fac447cb71404eedd331444f7f59de4aded98804e0f9b0dde7df19ceec081ee122d38fbf0747318fba SHA512 203de171fa6272c56d322b2ec1cd5b8690841bc4e047eb5118846415541905789a44abd37621f67ae97313f4b0fdfb42fe2c88dd83a0d60f0fe2956990881c96
+EBUILD s6-2.11.3.2-r1.ebuild 1178 BLAKE2B d5105aa0a81a634430c79ab7df4c69e7e4273a09c4269081e73d19396b39a10fcaf4dd2e02f2f757bb3b15b25f056959a82918d6282d2633033eb7bb29a6eefe SHA512 959d008ec52c99fe07de40efee8437585cbdd4b052bda73c5c79b7a12252ac07cab266ebb2de5d1764cbac6ccd210237fc24cffe8babf54ae23174a8dc510764
+EBUILD s6-2.12.0.0.ebuild 1187 BLAKE2B 51f0974eefebb464fea8fff60c1de5f57bafdbf9bae8247c8512095eac745cd2eef71c6264584a41d68bca154f2a7a5a9f55cf44b87ffa5de88b60ee99425961 SHA512 bd172e7a0553f601629d340f842408806ee4564e18da799fa9c6fc1000d5c68ee3833e32b01ec62528e169cb7e17c8ac1c1d4f86ca0c4ad1776b29935cc9975a
 MISC metadata.xml 883 BLAKE2B 9a3dfebf852c277dade51f8f3caa46863c8d0466c7371f70ebe4530818d33c9c3656011c1f45c68c26badd9ab396baa3336b017c6937763fd5de64fcf8da554d SHA512 09e18443d718af2ef9515efb8df03af309ba46c72022322a44c14f99152e0c5d7463c9c23a1ad3756fa40bc6345626999e388201259e943484f26303767b901f
diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2-r1.ebuild
index d38aa94a0fd2..3f47f07910ad 100644
--- a/sys-apps/s6/s6-2.11.3.2.ebuild
+++ b/sys-apps/s6/s6-2.11.3.2-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="
-	>=dev-libs/skalibs-2.13.1.0:=
+	dev-libs/skalibs:0/2.13
 	execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6/s6-2.12.0.0.ebuild b/sys-apps/s6/s6-2.12.0.0.ebuild
new file mode 100644
index 000000000000..165537535fbf
--- /dev/null
+++ b/sys-apps/s6/s6-2.12.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+	>=dev-libs/skalibs-2.14.0.0:=
+	execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/execline"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}