| 1 |
commit: d0bc6d1c27d21ffc194746212a2601b45f96e161 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Thu Jun 16 13:56:54 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 25 05:35:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0bc6d1c |
| 7 |
|
| 8 |
dev-lang/execline: drop IUSE="static static-libs" |
| 9 |
|
| 10 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/execline/execline-2.9.0.0.ebuild | 10 +++------- |
| 14 |
net-misc/s6-networking/s6-networking-2.5.1.0.ebuild | 2 +- |
| 15 |
sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild | 2 +- |
| 16 |
sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild | 2 +- |
| 17 |
sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild | 2 +- |
| 18 |
sys-apps/s6/s6-2.11.1.0.ebuild | 2 +- |
| 19 |
6 files changed, 8 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/execline/execline-2.9.0.0.ebuild b/dev-lang/execline/execline-2.9.0.0.ebuild |
| 22 |
index f92b613812ca..7881d1093e25 100644 |
| 23 |
--- a/dev-lang/execline/execline-2.9.0.0.ebuild |
| 24 |
+++ b/dev-lang/execline/execline-2.9.0.0.ebuild |
| 25 |
@@ -12,11 +12,8 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" |
| 26 |
LICENSE="ISC" |
| 27 |
SLOT="0/$(ver_cut 1-2)" |
| 28 |
KEYWORDS="~amd64 ~arm ~x86" |
| 29 |
-IUSE="static static-libs" |
| 30 |
|
| 31 |
-REQUIRED_USE="static? ( static-libs )" |
| 32 |
- |
| 33 |
-RDEPEND=">=dev-libs/skalibs-2.12.0.0:=[static-libs?]" |
| 34 |
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:=" |
| 35 |
DEPEND="${RDEPEND}" |
| 36 |
|
| 37 |
HTML_DOCS=( doc/. ) |
| 38 |
@@ -41,9 +38,8 @@ src_configure() { |
| 39 |
--with-lib=/usr/$(get_libdir)/skalibs |
| 40 |
--with-sysdeps=/usr/$(get_libdir)/skalibs |
| 41 |
--enable-shared |
| 42 |
- $(use_enable static allstatic) |
| 43 |
- $(use_enable static static-libc) |
| 44 |
- $(use_enable static-libs static) |
| 45 |
+ --disable-allstatic |
| 46 |
+ --disable-static-libc |
| 47 |
) |
| 48 |
|
| 49 |
econf "${myconf[@]}" |
| 50 |
|
| 51 |
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 |
| 52 |
index 8222c5bf856a..47977f15efc7 100644 |
| 53 |
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild |
| 54 |
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild |
| 55 |
@@ -17,7 +17,7 @@ IUSE="ssl static static-libs" |
| 56 |
REQUIRED_USE="static? ( static-libs ) |
| 57 |
ssl? ( !static !static-libs )" |
| 58 |
|
| 59 |
-RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?] |
| 60 |
+RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?] |
| 61 |
=dev-libs/skalibs-2.11*:=[static-libs?] |
| 62 |
>=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?] |
| 63 |
ssl? ( dev-libs/libretls ) |
| 64 |
|
| 65 |
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 |
| 66 |
index 002a1d69f2cc..d986c9bb879f 100644 |
| 67 |
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild |
| 68 |
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild |
| 69 |
@@ -16,7 +16,7 @@ IUSE="static static-libs +sysv-utils" |
| 70 |
|
| 71 |
REQUIRED_USE="static? ( static-libs )" |
| 72 |
|
| 73 |
-RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?] |
| 74 |
+RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?] |
| 75 |
>=dev-libs/skalibs-2.11.2.0:=[static-libs?] |
| 76 |
>=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] |
| 77 |
sysv-utils? ( |
| 78 |
|
| 79 |
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 |
| 80 |
index 3a8244973408..38c45fbb2943 100644 |
| 81 |
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild |
| 82 |
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild |
| 83 |
@@ -16,7 +16,7 @@ IUSE="static static-libs" |
| 84 |
|
| 85 |
REQUIRED_USE="static? ( static-libs )" |
| 86 |
|
| 87 |
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?] |
| 88 |
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?] |
| 89 |
>=dev-libs/skalibs-2.11.1.0:=[static-libs?] |
| 90 |
>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] |
| 91 |
" |
| 92 |
|
| 93 |
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 |
| 94 |
index 3a8244973408..38c45fbb2943 100644 |
| 95 |
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild |
| 96 |
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild |
| 97 |
@@ -16,7 +16,7 @@ IUSE="static static-libs" |
| 98 |
|
| 99 |
REQUIRED_USE="static? ( static-libs )" |
| 100 |
|
| 101 |
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?] |
| 102 |
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?] |
| 103 |
>=dev-libs/skalibs-2.11.1.0:=[static-libs?] |
| 104 |
>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] |
| 105 |
" |
| 106 |
|
| 107 |
diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild |
| 108 |
index ab9cc3bb0e38..2317b5e4151e 100644 |
| 109 |
--- a/sys-apps/s6/s6-2.11.1.0.ebuild |
| 110 |
+++ b/sys-apps/s6/s6-2.11.1.0.ebuild |
| 111 |
@@ -16,7 +16,7 @@ IUSE="+execline static static-libs" |
| 112 |
|
| 113 |
REQUIRED_USE="static? ( static-libs )" |
| 114 |
|
| 115 |
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] ) |
| 116 |
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] ) |
| 117 |
>=dev-libs/skalibs-2.11.2.0:=[static-libs?] |
| 118 |
" |
| 119 |
DEPEND="${RDEPEND}" |
Archives