From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACADA158094 for ; Sat, 25 Jun 2022 05:36:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53FC4E0837; Sat, 25 Jun 2022 05:36:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3550BE0837 for ; Sat, 25 Jun 2022 05:36:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D875934182B for ; Sat, 25 Jun 2022 05:36:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D892520 for ; Sat, 25 Jun 2022 05:36:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1656135315.5687d4da75fd3eb418bc6b3bf2c3a425bb73ec9b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/s6-networking/s6-networking-2.5.1.1.ebuild X-VCS-Directories: net-misc/s6-networking/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5687d4da75fd3eb418bc6b3bf2c3a425bb73ec9b X-VCS-Branch: master Date: Sat, 25 Jun 2022 05:36:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e734601e-f245-4c43-9531-10ff289f72cc X-Archives-Hash: 418a3e68f6de57c365ac5523e287564f commit: 5687d4da75fd3eb418bc6b3bf2c3a425bb73ec9b Author: Petr Vaněk atlas cz> AuthorDate: Thu Jun 16 13:19:39 2022 +0000 Commit: Sam James gentoo 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 atlas.cz> Signed-off-by: Sam James 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[@]}"