[gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/, net-dns/s6-dns/

[gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/, net-dns/s6-dns/

[Sam James]

commit:     d173f866c22bb6998ba5498ad33e582d79084547
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jun 16 13:32:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 05:35:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d173f866

net-dns/s6-dns: drop IUSE="static static-libs"

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/s6-dns/s6-dns-2.3.5.4.ebuild                | 10 +++-------
 net-misc/s6-networking/s6-networking-2.5.1.0.ebuild |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

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
index f2aac4dc81a3..3540fb714148 100644
--- a/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
+++ b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
@@ -12,11 +12,8 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
 
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-libs/skalibs-2.12.0.0:=[static-libs?]"
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
@@ -41,9 +38,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[@]}"

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
index 805c01e93e6c..c57afa4fb6c3 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
 	)
 "
 DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.5.2[static-libs?]
+	>=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
 "
 
 HTML_DOCS=( doc/. )