Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/, net-dns/s6-dns/
Date: Sat, 25 Jun 2022 05:36:36
Message-Id: 1656135316.d173f866c22bb6998ba5498ad33e582d79084547.sam@gentoo
1 commit: d173f866c22bb6998ba5498ad33e582d79084547
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Thu Jun 16 13:32:03 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 05:35:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d173f866
7
8 net-dns/s6-dns: 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 net-dns/s6-dns/s6-dns-2.3.5.4.ebuild | 10 +++-------
14 net-misc/s6-networking/s6-networking-2.5.1.0.ebuild | 2 +-
15 2 files changed, 4 insertions(+), 8 deletions(-)
16
17 diff --git a/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
18 index f2aac4dc81a3..3540fb714148 100644
19 --- a/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
20 +++ b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
21 @@ -12,11 +12,8 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
22 LICENSE="ISC"
23 SLOT="0/$(ver_cut 1-2)"
24 KEYWORDS="~amd64 ~x86"
25 -IUSE="static static-libs"
26
27 -REQUIRED_USE="static? ( static-libs )"
28 -
29 -RDEPEND=">=dev-libs/skalibs-2.12.0.0:=[static-libs?]"
30 +RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
31 DEPEND="${RDEPEND}"
32
33 HTML_DOCS=( doc/. )
34 @@ -41,9 +38,8 @@ src_configure() {
35 --with-lib=/usr/$(get_libdir)/skalibs
36 --with-sysdeps=/usr/$(get_libdir)/skalibs
37 --enable-shared
38 - $(use_enable static allstatic)
39 - $(use_enable static static-libc)
40 - $(use_enable static-libs static)
41 + --disable-allstatic
42 + --disable-static-libc
43 )
44
45 econf "${myconf[@]}"
46
47 diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
48 index 805c01e93e6c..c57afa4fb6c3 100644
49 --- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
50 +++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
51 @@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
52 )
53 "
54 DEPEND="${RDEPEND}
55 - >=net-dns/s6-dns-2.3.5.2[static-libs?]
56 + >=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
57 "
58
59 HTML_DOCS=( doc/. )