summaryrefslogtreecommitdiff
path: root/sys-apps/s6-linux-utils
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/s6-linux-utils')
-rw-r--r--sys-apps/s6-linux-utils/Manifest14
-rw-r--r--sys-apps/s6-linux-utils/metadata.xml8
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild51
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild42
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.1.ebuild40
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild40
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild12
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild48
8 files changed, 69 insertions, 186 deletions
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 8bec9c58ced8..70843c3c5caa 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,11 +1,5 @@
-DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
-DIST s6-linux-utils-2.5.0.0.tar.gz 34976 BLAKE2B ccbe5a24c39d32a6d3e9c1ba09c76c278ed33e831ba9d124e30615204f4084823efd13500b2b2a0efa0ddd703996ec3a47ea66a2b5c1f832d8003cffccf6b773 SHA512 0433fd7863135629d2ab849db34c77f0cbc146f7a84833fcb9263d49ed8366f370f0513bb055990e40a17dff69a1b83a741b1bac2fc8d159d866b45a6b81bdc9
-DIST s6-linux-utils-2.5.0.1.tar.gz 35273 BLAKE2B 61ba3a8ee1fce5357d4c3e71b442ade2277adf6b0560646b78cab3b922183ff15478190a3c4b3a7cce88f13d3836711b81f2c37bc7e545012708ee25f7b036cb SHA512 bc4693486299d1027b6ce908684fe2c66b8173b17baad3bb35a660f1d42f00e48ae56c762c17d162c7be978f7246a9ac5218a5c93c0b93f24b5dc881782329d5
-DIST s6-linux-utils-2.5.1.1.tar.gz 35513 BLAKE2B 7b5e613b3ec7a8104cd53ce2a6db921994ded9d890baee022d16f98f461a71804d16122f303ae66f32d3766325d566c80e04e27fda60a61d1f624eb5a65ae178 SHA512 59c58c4d8e13b7a6e0215f21978f8ac2ac54fc3685884204ea1f011f2a882b9381a9686cbb24c9e566e322c14174dda40368c308e37e9c44f6a1687231d108a2
DIST s6-linux-utils-2.5.1.3.tar.gz 35549 BLAKE2B e39dcf141839e6fc4554ba10fc89daaa7b9600ffa4360c80d3278d49224c88f124588ec988a2386a3243923002a16d9829d4828c829fda18745356fa6774175d SHA512 73c887e67251c162677b2151d37a1cdbb9cee6f50bd52c5eefd4750f9bf77452a023e0484891e384312fb169dfbe02af3d4cfecb17d34f1668cc0acb8d7a9181
-EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
-EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
-EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
-EBUILD s6-linux-utils-2.5.1.1.ebuild 1006 BLAKE2B 9cf302ee56e750aecc9c11b1b5bc0a8c47ea3f1fa5b97c7c2ded615f5eea59bd2793aebca3f58cee10a5cf16fbc5d8a507cce344c9cc32e71980d2d38d0cd020 SHA512 11ce68e1a66e0b13d47c0403c428c0885813ed2004ec3bd7d0520069caed21888106f8b52a826daf2e3253775b67e359320f31fb284b90db4b26a0f93ec07363
-EBUILD s6-linux-utils-2.5.1.3.ebuild 1006 BLAKE2B 775838d0b17dacddba4a208cd0d1c1d37e5f47f822fadd4fbca5ee3b83e1d040900782367969020593d32d1ac96cadb3dbcda84733273ec56d8d9eb5bec0b374 SHA512 919375509aaf59f8050622b6a90245fd319fca97b58045dfb1b7bcb689d49c707596b9253852f1d2424040d9e98b4d3c177529938e7b247391d3447240987ec9
-MISC metadata.xml 373 BLAKE2B 9748ed7f48b3e0a32bc04066a0f5e1903ed94576d9cee2c923d885ebd6343132dbdb1d4388362b8735156bf19a3288bbe950f99eb56de2a9b86afe2e253a68e1 SHA512 813abae479b70464886859c667888ab16dbaea41de2008707cc5d6f154f5da371ed5a6437788bec0a65e0bd49006e356fe16af6e57307c4eef6cde89a6b8888a
+DIST s6-linux-utils-2.5.1.7.tar.gz 36574 BLAKE2B 53b5c46e84873df2263eb05ef6dae2321957e2065966854402f819cff6712de991a3a3c480325556e53491c9016deb52c0a437a8b9bcc721dac97e31c98ba501 SHA512 dabe510d0a4d045578309beeec17aa1b4f88acb09513be65c31a7b338bd50fcb7cc809015fa7328c4a310b838f1335e754f49a12dcf369483c83294b5957156c
+EBUILD s6-linux-utils-2.5.1.3.ebuild 1115 BLAKE2B a2709fa8f63247cbb652ae9a4af0b639d199b7676946163d50f20254ebce130941acaae68900e4e1ac8a5a8c1e38da231de557815439aa51b9f1c948b9dc0287 SHA512 39ac3a5b2d126ea8e3601230727e5cb650417aa69ab5fbfab5eb69ad5dbea144a2a2294b1c2bd9bab19d488886b650986dc7192655eadb5c0dbb98c2268762e6
+EBUILD s6-linux-utils-2.5.1.7.ebuild 1066 BLAKE2B 8427cd51cb747160d4719ae706432817c55f1c2155428e1d83863be536035bdd6023232d7652d46f69ec2c3068642e1885edbea8e6259772de136e7059d798e1 SHA512 0d9803bf229ed77b5389d9e6ab7227eb223de5fa9070abbab55569ec2b8ed21e42f986e7dc6c1acb5cf090f8e4914de4edb4ed8008862c3b51d2e6d1f3d27d0c
+MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index 3c6c082ed21d..aed39d3983af 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -9,4 +9,12 @@
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>arkamar@atlas.cz</email>
+ <name>Petr Vaněk</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild
deleted file mode 100644
index 8715c0b70db4..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
- static? (
- >=dev-libs/skalibs-2.6.0.2[static-libs]
- )
- !static? (
- >=dev-libs/skalibs-2.6.0.2
- )
-"
-RDEPEND="
- !static? (
- >=dev-libs/skalibs-2.6.0.2:=
- )
-"
-
-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)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable static allstatic) \
- $(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild
deleted file mode 100644
index cbebf69605fa..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="static? ( >=dev-libs/skalibs-2.7.0.0[static-libs] )
- !static? ( >=dev-libs/skalibs-2.7.0.0 )
-"
-RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
-
-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)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable static allstatic) \
- $(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.1.ebuild
deleted file mode 100644
index 85381c98cad8..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.8.0.0:= )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.8.0.0[static-libs] )
-"
-
-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)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable static allstatic) \
- $(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
deleted file mode 100644
index 68fbddbb8813..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.9.1.0:= )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.9.1.0[static-libs] )
-"
-
-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)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable static allstatic) \
- $(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
index 21a3aee0c4af..7637a669f3ad 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.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="Set of tiny linux utilities"
HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
@@ -12,9 +14,9 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="static"
-RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )"
+RDEPEND="!static? ( <dev-libs/skalibs-2.10.0.0:= )"
DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] )
+ static? ( <dev-libs/skalibs-2.10.0.0[static-libs] )
"
HTML_DOCS=( doc/. )
@@ -25,9 +27,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) \
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
new file mode 100644
index 000000000000..5d413e9c74c8
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static"
+
+RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
+DEPEND="${RDEPEND}
+ static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
+"
+
+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)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ )
+
+ econf "${myconf[@]}"
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-15 11:58:08 +0000