summaryrefslogtreecommitdiff
path: root/sys-apps/s6
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/s6')
-rw-r--r--sys-apps/s6/Manifest4
-rw-r--r--sys-apps/s6/s6-2.11.3.0.ebuild54
-rw-r--r--sys-apps/s6/s6-2.11.3.2.ebuild2
3 files changed, 2 insertions, 58 deletions
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 193e65a57507..6c8ff58c97cf 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,5 +1,3 @@
-DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19 SHA512 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22 SHA512 fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
-EBUILD s6-2.11.3.0.ebuild 1184 BLAKE2B 3a7f6160c952ec46c2645fcdd3357ede7700cc04d45b004785874b3e0f75486c77fe43bbc2e86005f167a1180c5b8b28cdbc8ed3aded60b3c2abad17d7a47244 SHA512 7b6e50b8d659363e2bf44e56ffce6c2db3d23f12ad2ad96ae299f0b0f52bac261fddb685d272853bf94efecc407874c1d84d780c9ee3dd522f367f0cc6d756bb
-EBUILD s6-2.11.3.2.ebuild 1185 BLAKE2B fcbc621a63147bfcfac3ecf4d5ef2c26d56ae4ac4633919d30da94cb2ba9292707507a9931168a95ddcce93eb8cb2e84b018915bd9c9398ea208ee96525ab279 SHA512 828a26049002e24cf1521acaa20753e377ae427da7917c3353fd1f8f20761425d4dae59de309ad71ba179a736bb62343c1c30b82a64e3d5e44e75ab9c05f5ad0
+EBUILD s6-2.11.3.2.ebuild 1184 BLAKE2B 3a7f6160c952ec46c2645fcdd3357ede7700cc04d45b004785874b3e0f75486c77fe43bbc2e86005f167a1180c5b8b28cdbc8ed3aded60b3c2abad17d7a47244 SHA512 7b6e50b8d659363e2bf44e56ffce6c2db3d23f12ad2ad96ae299f0b0f52bac261fddb685d272853bf94efecc407874c1d84d780c9ee3dd522f367f0cc6d756bb
MISC metadata.xml 883 BLAKE2B 9a3dfebf852c277dade51f8f3caa46863c8d0466c7371f70ebe4530818d33c9c3656011c1f45c68c26badd9ab396baa3336b017c6937763fd5de64fcf8da554d SHA512 09e18443d718af2ef9515efb8df03af309ba46c72022322a44c14f99152e0c5d7463c9c23a1ad3756fa40bc6345626999e388201259e943484f26303767b901f
diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
deleted file mode 100644
index d38aa94a0fd2..000000000000
--- a/sys-apps/s6/s6-2.11.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
- >=dev-libs/skalibs-2.13.1.0:=
- execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir="/$(get_libdir)"
- --libdir="/usr/$(get_libdir)/${PN}"
- --libexecdir=/lib/s6
- --with-dynlib="/$(get_libdir)"
- --with-lib="/usr/$(get_libdir)/execline"
- --with-lib="/usr/$(get_libdir)/skalibs"
- --with-sysdeps="/usr/$(get_libdir)/skalibs"
- --enable-shared
- --disable-allstatic
- --disable-static
- --disable-static-libc
- $(use_enable execline)
- )
-
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2.ebuild
index 7edd95a7f70b..d38aa94a0fd2 100644
--- a/sys-apps/s6/s6-2.11.3.2.ebuild
+++ b/sys-apps/s6/s6-2.11.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 arm ~riscv x86"
IUSE="+execline"
RDEPEND="