diff options
Diffstat (limited to 'sys-apps/s6-linux-init')
| -rw-r--r-- | sys-apps/s6-linux-init/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild | 72 | ||||
| -rw-r--r-- | sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild (renamed from sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild) | 6 | ||||
| -rw-r--r-- | sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild (renamed from sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild) | 15 |
4 files changed, 12 insertions, 89 deletions
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest index 96e4b5d7b74e..0744abd9dcb3 100644 --- a/sys-apps/s6-linux-init/Manifest +++ b/sys-apps/s6-linux-init/Manifest @@ -1,7 +1,5 @@ -DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53 -DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3 -EBUILD s6-linux-init-1.0.4.2.ebuild 1792 BLAKE2B 13834f7a4794db95f5cca7b98b8e2a119d5ba341a81a256ea953987c04994224d7108c43a0e375cf003821089f5973640e2399f3ce656d636abef7f3ed58fbed SHA512 83a8813ae4d6d6fe87d23c74e8093a999e52d29d4b4433172ff13dc55ecbb750da5729aa8f899b874ab0fbdea82eb21b5f82a4d975fc75de45c37422b64d0d83 -EBUILD s6-linux-init-1.0.7.1.ebuild 1734 BLAKE2B 68c3cd8aa92cd63dc66997ef24291d83b78b735cbfe68bcecfe18eafbb4626ad4d28eea1f825ab9dc4b14e3ff290a7d84bfed9260882e846cf9bed321ec089d1 SHA512 bec91dde8777bd4694528cea56410a98d640f94b7fce97ec81763f0cefa5e59dc92fe1be8b6ec3aad027ce3eb6bb2c583c45ccab5f194744caafd9d4c9484b9b -EBUILD s6-linux-init-1.0.7.3.ebuild 1736 BLAKE2B c4726a5a52c2f662471f13bdcd644b5c3260b299a9a49dad3bf2948e9ce0aaa7d12ba9a52a6b8ec09a16e3fef96dad03c990636c181e77c4495cd7d77f8bb38a SHA512 ba7b39e4e7a14c03de166fd3bd9fdcecd97e71e06466108bfb692a0d02cd2e1e3fa81e8f9d84de3d9ce54985867f5a93b5dfe6da7aeb8d3373dbc55cd08b294a +DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346 +EBUILD s6-linux-init-1.0.7.3-r1.ebuild 1743 BLAKE2B d2687d2be6ea3e4c6add5cf3cae82cd661fbd63ab51fbb9131c16535027002589c8c4dc11d1ec1be4a4ff987ec7929f00faf1dc466d6900193754d8ad1f93388 SHA512 4d4028b445e3a4c6f7d7c126cea23007163e6e590139a6e29db60cb108f8d959ad4f50e8e00c8668fbb24ca34aedaa898311916e649b205a8371459212a2f070 +EBUILD s6-linux-init-1.0.8.0.ebuild 1547 BLAKE2B b442d9b7539c96f8956a59cd60230a2061c1877a922ba0a491c21653b2b910060f16ace0869dc2c58b2dff5dc6fa757f2cefb609dc3727960bceffd95c46540d SHA512 1f27ab694807e37e6162dd9850939aedffd239de3432e080da91f1822fde6f16c5ee8ab6e7883a4026cce4a21f222ce9e2392300c90ccdf162822202381baf36 MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666 diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild deleted file mode 100644 index 63b8c46f64c7..000000000000 --- a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Generates an init binary for s6-based init systems" -HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="static static-libs +sysv-utils" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?] - <dev-libs/skalibs-2.10.0.0:=[static-libs?] - <sys-apps/s6-2.10.0.0:=[execline,static-libs?] - sysv-utils? ( - !sys-apps/systemd[sysv-utils] - !sys-apps/sysvinit - ) -" -DEPEND="${RDEPEND}" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ - configure || die - - sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die -} - -src_configure() { - tc-export AR CC RANLIB - - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --skeldir=/etc/s6-linux-init/skel \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} - -src_install() { - default - - if use sysv-utils ; then - "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die - into / - dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit} - fi -} - -pkg_postinst() { - einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html" - einfo "for usage instructions." -} diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild index 305a8b7a163c..415a46d9f524 100644 --- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild +++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild @@ -16,9 +16,9 @@ IUSE="static static-libs +sysv-utils" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?] - >=dev-libs/skalibs-2.11.1.0:=[static-libs?] - >=sys-apps/s6-2.11.0.1:=[execline,static-libs?] +RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?] + >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] + >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit 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.8.0.ebuild index 3d6d31aec21b..134f021dac5e 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.8.0.ebuild @@ -12,13 +12,11 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0/$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~x86" -IUSE="static static-libs +sysv-utils" +IUSE="+sysv-utils" -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-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?] +RDEPEND="dev-lang/execline:= + dev-libs/skalibs:= + sys-apps/s6:=[execline] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit @@ -50,9 +48,8 @@ src_configure() { --with-lib=/usr/$(get_libdir)/skalibs --with-sysdeps=/usr/$(get_libdir)/skalibs --enable-shared - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) + --disable-allstatic + --disable-static-libc ) econf "${myconf[@]}" |