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

[Sam James]

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

net-misc/s6-networking: drop IUSE="static static-libs"

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

 .../s6-networking/s6-networking-2.5.1.1.ebuild     | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
index b5098c86c898..9adaf81f7a5d 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
@@ -12,22 +12,15 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
+IUSE="ssl"
 
-REQUIRED_USE="static? ( static-libs )
-	ssl? ( !static !static-libs )"
-
-RDEPEND="dev-lang/execline:=[static-libs?]
-	>=dev-libs/skalibs-2.12:=[static-libs?]
-	sys-apps/s6:=[execline,static-libs?]
+RDEPEND="dev-lang/execline:=
+	>=dev-libs/skalibs-2.12.0.0:=
+	net-dns/s6-dns:=
+	sys-apps/s6:=[execline]
 	ssl? ( dev-libs/libretls )
-	!static? (
-		net-dns/s6-dns:=
-	)
-"
-DEPEND="${RDEPEND}
-	net-dns/s6-dns[static-libs?]
 "
+DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
 
@@ -53,10 +46,9 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/skalibs
 		--with-sysdeps=/usr/$(get_libdir)/skalibs
 		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
 		$(use_enable ssl ssl libtls)
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
 	)
 
 	econf "${myconf[@]}"