Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
Date: Sat, 25 Jun 2022 05:36:37
Message-Id: 1656135317.5215a121416234b309030e34673b47a6bc9ce6d4.sam@gentoo
1 commit: 5215a121416234b309030e34673b47a6bc9ce6d4
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Thu Jun 16 13:41:59 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 05:35:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5215a121
7
8 sys-apps/s6-linux-init: drop IUSE="static static-libs"
9
10 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild | 15 ++++++---------
14 1 file changed, 6 insertions(+), 9 deletions(-)
15
16 diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
17 index 4f9d522eb39b..134f021dac5e 100644
18 --- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
19 +++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
20 @@ -12,13 +12,11 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
21 LICENSE="ISC"
22 SLOT="0/$(ver_cut 1-2)"
23 KEYWORDS="~amd64 ~arm ~x86"
24 -IUSE="static static-libs +sysv-utils"
25 +IUSE="+sysv-utils"
26
27 -REQUIRED_USE="static? ( static-libs )"
28 -
29 -RDEPEND="dev-lang/execline:=[static-libs?]
30 - dev-libs/skalibs:=[static-libs?]
31 - sys-apps/s6:=[execline,static-libs?]
32 +RDEPEND="dev-lang/execline:=
33 + dev-libs/skalibs:=
34 + sys-apps/s6:=[execline]
35 sysv-utils? (
36 !sys-apps/systemd[sysv-utils]
37 !sys-apps/sysvinit
38 @@ -50,9 +48,8 @@ src_configure() {
39 --with-lib=/usr/$(get_libdir)/skalibs
40 --with-sysdeps=/usr/$(get_libdir)/skalibs
41 --enable-shared
42 - $(use_enable static allstatic)
43 - $(use_enable static static-libc)
44 - $(use_enable static-libs static)
45 + --disable-allstatic
46 + --disable-static-libc
47 )
48
49 econf "${myconf[@]}"