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-rc/
Date: Sat, 25 Jun 2022 05:36:38
Message-Id: 1656135317.ab67779a229abc61f9812bd2d015d2b7ed588822.sam@gentoo
1 commit: ab67779a229abc61f9812bd2d015d2b7ed588822
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Thu Jun 16 13:44:02 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=ab67779a
7
8 sys-apps/s6-rc: 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-rc/s6-rc-0.5.3.2.ebuild | 14 +++++---------
14 1 file changed, 5 insertions(+), 9 deletions(-)
15
16 diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
17 index 35dea1d4a721..9304b3decb02 100644
18 --- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
19 +++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
20 @@ -12,13 +12,10 @@ 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"
25
26 -REQUIRED_USE="static? ( static-libs )"
27 -
28 -RDEPEND="dev-lang/execline:=[static-libs?]
29 - dev-libs/skalibs:=[static-libs?]
30 - sys-apps/s6:=[execline,static-libs?]
31 +RDEPEND="dev-lang/execline:=
32 + dev-libs/skalibs:=
33 + sys-apps/s6:=[execline]
34 "
35 DEPEND="${RDEPEND}"
36
37 @@ -46,9 +43,8 @@ src_configure() {
38 --with-lib=/usr/$(get_libdir)/skalibs
39 --with-sysdeps=/usr/$(get_libdir)/skalibs
40 --enable-shared
41 - $(use_enable static allstatic)
42 - $(use_enable static static-libc)
43 - $(use_enable static-libs static)
44 + --disable-allstatic
45 + --disable-static-libc
46 )
47
48 econf "${myconf[@]}"