summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Vaněk <arkamar@atlas.cz>2022-06-16 15:56:54 +0200
committerSam James <sam@gentoo.org>2022-06-25 06:35:18 +0100
commitd0bc6d1c27d21ffc194746212a2601b45f96e161 (patch)
treea72f0f5e07b333a73951bf274ae5e14c3ea40dc1
parentsys-apps/s6: drop IUSE="static static-libs" (diff)
downloadgentoo-d0bc6d1c27d21ffc194746212a2601b45f96e161.tar.gz
gentoo-d0bc6d1c27d21ffc194746212a2601b45f96e161.tar.bz2
gentoo-d0bc6d1c27d21ffc194746212a2601b45f96e161.zip
dev-lang/execline: drop IUSE="static static-libs"
Signed-off-by: Petr Vaněk <arkamar@atlas.cz> Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-lang/execline/execline-2.9.0.0.ebuild10
-rw-r--r--net-misc/s6-networking/s6-networking-2.5.1.0.ebuild2
-rw-r--r--sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild2
-rw-r--r--sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild2
-rw-r--r--sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild2
-rw-r--r--sys-apps/s6/s6-2.11.1.0.ebuild2
6 files changed, 8 insertions, 12 deletions
diff --git a/dev-lang/execline/execline-2.9.0.0.ebuild b/dev-lang/execline/execline-2.9.0.0.ebuild
index f92b613812ca..7881d1093e25 100644
--- a/dev-lang/execline/execline-2.9.0.0.ebuild
+++ b/dev-lang/execline/execline-2.9.0.0.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 ~arm ~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 8222c5bf856a..47977f15efc7 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
@@ -17,7 +17,7 @@ IUSE="ssl static static-libs"
REQUIRED_USE="static? ( static-libs )
ssl? ( !static !static-libs )"
-RDEPEND=">=dev-lang/execline-2.8.1.0:=[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(-)?]
ssl? ( dev-libs/libretls )
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 002a1d69f2cc..d986c9bb879f 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
@@ -16,7 +16,7 @@ IUSE="static static-libs +sysv-utils"
REQUIRED_USE="static? ( static-libs )"
-RDEPEND=">=dev-lang/execline-2.8.3.0:=[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(-)?]
sysv-utils? (
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 3a8244973408..38c45fbb2943 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
@@ -16,7 +16,7 @@ IUSE="static static-libs"
REQUIRED_USE="static? ( static-libs )"
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[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(-)?]
"
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 3a8244973408..38c45fbb2943 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
@@ -16,7 +16,7 @@ IUSE="static static-libs"
REQUIRED_USE="static? ( static-libs )"
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[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(-)?]
"
diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild
index ab9cc3bb0e38..2317b5e4151e 100644
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ b/sys-apps/s6/s6-2.11.1.0.ebuild
@@ -16,7 +16,7 @@ IUSE="+execline static static-libs"
REQUIRED_USE="static? ( static-libs )"
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] )
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] )
>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
"
DEPEND="${RDEPEND}"