Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/, sys-apps/s6-portable-utils/, net-dns/s6-dns/, ...
Date: Sat, 25 Jun 2022 05:36:33
Message-Id: 1656135311.6f819ad2d1cb7b0f9c31b43a03526b817c5f3c0a.sam@gentoo
1 commit: 6f819ad2d1cb7b0f9c31b43a03526b817c5f3c0a
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Thu Jun 16 11:54:13 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 05:35:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f819ad2
7
8 */s6-*: limit skalibs dependency version
9
10 Few s6 related packages are not compatible with newly released
11 dev-libs/skalibs-2.12.0.0, therefore it is necessary to limit this
12 dependency to =dev-libs/skalibs-2.11*.
13
14 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 net-dns/s6-dns/s6-dns-2.3.5.3.ebuild | 2 +-
18 net-misc/s6-networking/s6-networking-2.5.1.0.ebuild | 2 +-
19 sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild | 4 ++--
20 sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild | 4 ++--
21 4 files changed, 6 insertions(+), 6 deletions(-)
22
23 diff --git a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
24 index 14abc3c2c212..f5cabf08e349 100644
25 --- a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
26 +++ b/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
27 @@ -16,7 +16,7 @@ IUSE="static static-libs"
28
29 REQUIRED_USE="static? ( static-libs )"
30
31 -RDEPEND=">=dev-libs/skalibs-2.11.1.0:=[static-libs?]"
32 +RDEPEND="=dev-libs/skalibs-2.11*:=[static-libs?]"
33 DEPEND="${RDEPEND}"
34
35 HTML_DOCS=( doc/. )
36
37 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
38 index 47a1748d6605..805c01e93e6c 100644
39 --- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
40 +++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
41 @@ -18,7 +18,7 @@ REQUIRED_USE="static? ( static-libs )
42 ssl? ( !static !static-libs )"
43
44 RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
45 - >=dev-libs/skalibs-2.11.0.0:=[static-libs?]
46 + =dev-libs/skalibs-2.11*:=[static-libs?]
47 >=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
48 ssl? ( dev-libs/libretls )
49 !static? (
50
51 diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
52 index 3a7aed22a1ac..8b385d9a68ab 100644
53 --- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
54 +++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
55 @@ -14,9 +14,9 @@ SLOT="0"
56 KEYWORDS="amd64 ~arm ~arm64 x86"
57 IUSE="static"
58
59 -RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
60 +RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
61 DEPEND="${RDEPEND}
62 - static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
63 + static? ( =dev-libs/skalibs-2.11*[static-libs] )
64 "
65
66 HTML_DOCS=( doc/. )
67
68 diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
69 index 4b3acc96437c..175012649933 100644
70 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
71 +++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
72 @@ -14,9 +14,9 @@ SLOT="0"
73 KEYWORDS="amd64 ~arm x86"
74 IUSE="static"
75
76 -RDEPEND="!static? ( >=dev-libs/skalibs-2.11.2.0:= )"
77 +RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
78 DEPEND="${RDEPEND}
79 - static? ( >=dev-libs/skalibs-2.11.2.0[static-libs] )
80 + static? ( =dev-libs/skalibs-2.11*[static-libs] )
81 "
82
83 HTML_DOCS=( doc/. )