public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/
Date: Sat, 25 Jun 2022 05:36:30 +0000 (UTC)	[thread overview]
Message-ID: <1656135315.5687d4da75fd3eb418bc6b3bf2c3a425bb73ec9b.sam@gentoo> (raw)

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[@]}"


             reply	other threads:[~2022-06-25  5:36 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-25  5:36 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-05 15:24 [gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/ Petr Vaněk
2024-10-24  9:39 Petr Vaněk
2024-08-30 10:19 Petr Vaněk
2024-06-14 13:31 Petr Vaněk
2024-06-09 21:12 Sam James
2024-06-09 21:12 Sam James
2024-01-22  8:18 Petr Vaněk
2024-01-17 10:39 Petr Vaněk
2024-01-16 10:45 Petr Vaněk
2024-01-16 10:45 Petr Vaněk
2023-12-21 14:28 Petr Vaněk
2023-12-21 14:28 Petr Vaněk
2023-12-05 15:08 Petr Vaněk
2023-11-22 11:38 Sam James
2023-11-17 11:09 Sam James
2023-05-20 12:32 Joonas Niilola
2023-02-21  8:01 Sam James
2023-01-17  1:53 Sam James
2023-01-17  1:53 Sam James
2022-08-16 15:26 Joonas Niilola
2022-06-25  5:36 Sam James
2022-05-24  7:01 Joonas Niilola
2022-01-28  8:00 Sam James
2022-01-28  8:00 Sam James
2022-01-28  8:00 Sam James
2022-01-28  8:00 Sam James
2020-12-29  1:21 William Hubbs
2020-10-11 17:49 William Hubbs
2020-05-16  7:09 Joonas Niilola
2019-11-28 21:54 William Hubbs
2019-06-22  7:52 Michał Górny
2018-10-09  0:12 Georgy Yakovlev
2018-10-02 22:08 Michał Górny
2018-03-29 13:25 William Hubbs
2017-10-03 18:47 William Hubbs
2017-05-21 21:29 William Hubbs
2017-04-26 21:29 William Hubbs
2017-01-11 23:43 William Hubbs

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1656135315.5687d4da75fd3eb418bc6b3bf2c3a425bb73ec9b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox