| 1 |
commit: 01de0621eb30f2c1a3fc98b77cf38be90a4837f7 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Thu Jun 16 13:50:44 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=01de0621 |
| 7 |
|
| 8 |
sys-apps/s6: 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 |
net-misc/s6-networking/s6-networking-2.5.1.0.ebuild | 2 +- |
| 14 |
sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild | 2 +- |
| 15 |
sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild | 2 +- |
| 16 |
sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild | 2 +- |
| 17 |
sys-apps/s6/s6-2.11.1.1.ebuild | 13 +++++-------- |
| 18 |
5 files changed, 9 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index c57afa4fb6c3..8222c5bf856a 100644 |
| 22 |
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild |
| 23 |
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild |
| 24 |
@@ -19,7 +19,7 @@ REQUIRED_USE="static? ( static-libs ) |
| 25 |
|
| 26 |
RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?] |
| 27 |
=dev-libs/skalibs-2.11*:=[static-libs?] |
| 28 |
- >=sys-apps/s6-2.11.0.0:=[execline,static-libs?] |
| 29 |
+ >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?] |
| 30 |
ssl? ( dev-libs/libretls ) |
| 31 |
!static? ( |
| 32 |
>=net-dns/s6-dns-2.3.5.2:= |
| 33 |
|
| 34 |
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 |
| 35 |
index 01807f8d704e..002a1d69f2cc 100644 |
| 36 |
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild |
| 37 |
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild |
| 38 |
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )" |
| 39 |
|
| 40 |
RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?] |
| 41 |
>=dev-libs/skalibs-2.11.2.0:=[static-libs?] |
| 42 |
- >=sys-apps/s6-2.11.1.0:=[execline,static-libs?] |
| 43 |
+ >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] |
| 44 |
sysv-utils? ( |
| 45 |
!sys-apps/systemd[sysv-utils] |
| 46 |
!sys-apps/sysvinit |
| 47 |
|
| 48 |
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 |
| 49 |
index 6feff233b4ae..3a8244973408 100644 |
| 50 |
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild |
| 51 |
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild |
| 52 |
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )" |
| 53 |
|
| 54 |
RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?] |
| 55 |
>=dev-libs/skalibs-2.11.1.0:=[static-libs?] |
| 56 |
- >=sys-apps/s6-2.11.0.1:=[execline,static-libs?] |
| 57 |
+ >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] |
| 58 |
" |
| 59 |
DEPEND="${RDEPEND}" |
| 60 |
|
| 61 |
|
| 62 |
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 |
| 63 |
index 6feff233b4ae..3a8244973408 100644 |
| 64 |
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild |
| 65 |
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild |
| 66 |
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )" |
| 67 |
|
| 68 |
RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?] |
| 69 |
>=dev-libs/skalibs-2.11.1.0:=[static-libs?] |
| 70 |
- >=sys-apps/s6-2.11.0.1:=[execline,static-libs?] |
| 71 |
+ >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] |
| 72 |
" |
| 73 |
DEPEND="${RDEPEND}" |
| 74 |
|
| 75 |
|
| 76 |
diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild |
| 77 |
index ba06fd3ede5b..dcdeeef35af5 100644 |
| 78 |
--- a/sys-apps/s6/s6-2.11.1.1.ebuild |
| 79 |
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild |
| 80 |
@@ -12,12 +12,10 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" |
| 81 |
LICENSE="ISC" |
| 82 |
SLOT="0/$(ver_cut 1-2)" |
| 83 |
KEYWORDS="~amd64 ~arm ~x86" |
| 84 |
-IUSE="+execline static static-libs" |
| 85 |
+IUSE="+execline" |
| 86 |
|
| 87 |
-REQUIRED_USE="static? ( static-libs )" |
| 88 |
- |
| 89 |
-RDEPEND="dev-libs/skalibs:=[static-libs?] |
| 90 |
- execline? ( dev-lang/execline:=[static-libs?] ) |
| 91 |
+RDEPEND="dev-libs/skalibs:= |
| 92 |
+ execline? ( dev-lang/execline:= ) |
| 93 |
" |
| 94 |
DEPEND="${RDEPEND}" |
| 95 |
|
| 96 |
@@ -44,9 +42,8 @@ src_configure() { |
| 97 |
--with-lib=/usr/$(get_libdir)/skalibs |
| 98 |
--with-sysdeps=/usr/$(get_libdir)/skalibs |
| 99 |
--enable-shared |
| 100 |
- $(use_enable static allstatic) |
| 101 |
- $(use_enable static static-libc) |
| 102 |
- $(use_enable static-libs static) |
| 103 |
+ --disable-allstatic |
| 104 |
+ --disable-static-libc |
| 105 |
$(use_enable execline) |
| 106 |
) |
Archives