commit: 10f043bab12f29854689692a70cf42cee834fc01 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Wed Jan 26 15:25:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 28 07:59:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f043ba
*/*: limit dependencies for older versions of skarnet software Multiple incompatible changes were presented in dev-libs/skalibs-2.10.0.0 and sys-apps/s6-2.10.0.0, therefore it is necessary to limit dependencies correctly for older ebuilds. Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/20895 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/execline/execline-2.6.1.1.ebuild | 2 +- net-dns/s6-dns/s6-dns-2.3.3.0.ebuild | 2 +- net-misc/s6-networking/s6-networking-2.3.2.0.ebuild | 10 +++++----- sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild | 6 +++--- sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild | 4 ++-- sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild | 4 ++-- sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild | 6 +++--- sys-apps/s6/s6-2.9.2.0.ebuild | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-lang/execline/execline-2.6.1.1.ebuild b/dev-lang/execline/execline-2.6.1.1.ebuild index 26c92c8e38af..83a8194344ff 100644 --- a/dev-lang/execline/execline-2.6.1.1.ebuild +++ b/dev-lang/execline/execline-2.6.1.1.ebuild @@ -16,7 +16,7 @@ IUSE="static static-libs" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-libs/skalibs-2.9.3.0:=[static-libs?]" +RDEPEND="<dev-libs/skalibs-2.10.0.0:=[static-libs?]" DEPEND="${RDEPEND}" HTML_DOCS=( doc/. ) diff --git a/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild index fbb637b2de30..3d1928213ef2 100644 --- a/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild +++ b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild @@ -16,7 +16,7 @@ IUSE="static static-libs" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-libs/skalibs-2.9.3.0:=[static-libs?]" +RDEPEND="<dev-libs/skalibs-2.10.0.0:=[static-libs?]" DEPEND="${RDEPEND}" HTML_DOCS=( doc/. ) diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild index 188831293ff0..a0221c4ec4bf 100644 --- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild +++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild @@ -16,15 +16,15 @@ IUSE="static static-libs" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?] - >=dev-libs/skalibs-2.9.3.0:=[static-libs?] - >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] +RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?] + <dev-libs/skalibs-2.10.0.0:=[static-libs?] + <sys-apps/s6-2.10.0.0:=[execline,static-libs?] !static? ( - >=net-dns/s6-dns-2.3.3.0:= + <net-dns/s6-dns-2.3.4.0:= ) " DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.3.0[static-libs?] + <net-dns/s6-dns-2.3.4.0[static-libs?] " HTML_DOCS=( doc/. ) diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild index 05713a2616fc..63b8c46f64c7 100644 --- a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild +++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild @@ -16,9 +16,9 @@ IUSE="static static-libs +sysv-utils" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-lang/execline-2.6.1.0:=[static-libs?] - >=dev-libs/skalibs-2.9.2.1:=[static-libs?] - >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] +RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?] + <dev-libs/skalibs-2.10.0.0:=[static-libs?] + <sys-apps/s6-2.10.0.0:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild index a80db33ac386..7637a669f3ad 100644 --- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild +++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild @@ -14,9 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="static" -RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )" +RDEPEND="!static? ( <dev-libs/skalibs-2.10.0.0:= )" DEPEND="${RDEPEND} - static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] ) + static? ( <dev-libs/skalibs-2.10.0.0[static-libs] ) " HTML_DOCS=( doc/. ) diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild index 367204b5c902..321cb2248504 100644 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild +++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild @@ -14,9 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="static" -RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )" +RDEPEND="!static? ( >=dev-libs/skalibs-2.10.0.0:= )" DEPEND="${RDEPEND} - static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] ) + static? ( >=dev-libs/skalibs-2.10.0.0[static-libs] ) " HTML_DOCS=( doc/. ) diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild index d260c7317805..88fb3dd4c768 100644 --- a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild +++ b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild @@ -16,9 +16,9 @@ IUSE="static static-libs" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?] - >=dev-libs/skalibs-2.9.3.0:=[static-libs?] - >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] +RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?] + <dev-libs/skalibs-2.10.0.0:=[static-libs?] + <sys-apps/s6-2.10.0.0:=[execline,static-libs?] " DEPEND="${RDEPEND}" diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild index b5bc32e0f941..473967d84b7d 100644 --- a/sys-apps/s6/s6-2.9.2.0.ebuild +++ b/sys-apps/s6/s6-2.9.2.0.ebuild @@ -16,8 +16,8 @@ IUSE="+execline static static-libs" REQUIRED_USE="static? ( static-libs )" -RDEPEND="execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] ) - >=dev-libs/skalibs-2.9.2.1:=[static-libs?] +RDEPEND="execline? ( <dev-lang/execline-2.7.0.0:=[static-libs?] ) + <dev-libs/skalibs-2.10.0.0:=[static-libs?] " DEPEND="${RDEPEND}"
