commit: 01de0621eb30f2c1a3fc98b77cf38be90a4837f7
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jun 16 13:50:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 05:35:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01de0621
sys-apps/s6: 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-misc/s6-networking/s6-networking-2.5.1.0.ebuild | 2 +-
sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild | 2 +-
sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild | 2 +-
sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild | 2 +-
sys-apps/s6/s6-2.11.1.1.ebuild | 13 +++++--------
5 files changed, 9 insertions(+), 12 deletions(-)
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 c57afa4fb6c3..8222c5bf856a 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
@@ -19,7 +19,7 @@ REQUIRED_USE="static? ( static-libs )
RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
=dev-libs/skalibs-2.11*:=[static-libs?]
- >=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+ >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?]
ssl? ( dev-libs/libretls )
!static? (
>=net-dns/s6-dns-2.3.5.2:=
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
index 01807f8d704e..002a1d69f2cc 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )"
RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?]
>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
- >=sys-apps/s6-2.11.1.0:=[execline,static-libs?]
+ >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?]
sysv-utils? (
!sys-apps/systemd[sysv-utils]
!sys-apps/sysvinit
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
index 6feff233b4ae..3a8244973408 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )"
RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
- >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+ >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
"
DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
index 6feff233b4ae..3a8244973408 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )"
RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
- >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+ >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
"
DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
index ba06fd3ede5b..dcdeeef35af5 100644
--- a/sys-apps/s6/s6-2.11.1.1.ebuild
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -12,12 +12,10 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz";
LICENSE="ISC"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+execline static static-libs"
+IUSE="+execline"
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="dev-libs/skalibs:=[static-libs?]
- execline? ( dev-lang/execline:=[static-libs?] )
+RDEPEND="dev-libs/skalibs:=
+ execline? ( dev-lang/execline:= )
"
DEPEND="${RDEPEND}"
@@ -44,9 +42,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
$(use_enable execline)
)
