commit: 487957e2cb32ee5ab9db08970d029a5f565f2d94 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 3 04:08:03 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 3 05:07:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487957e2
dev-ruby/slim: fix collision between slots It doesn't look like slim 5 breaks very much (famous last words) so let's just use SLOT="4" like the previous version did. Add a blocker to avoid issues for people who happened to have SLOT="5" installed although I doubt it's very many. Closes: https://bugs.gentoo.org/903692 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ruby/slim/{slim-4.1.0-r3.ebuild => slim-4.1.0-r4.ebuild} | 7 +++++-- dev-ruby/slim/{slim-5.1.0.ebuild => slim-5.1.0-r1.ebuild} | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-ruby/slim/slim-4.1.0-r3.ebuild b/dev-ruby/slim/slim-4.1.0-r4.ebuild similarity index 94% rename from dev-ruby/slim/slim-4.1.0-r3.ebuild rename to dev-ruby/slim/slim-4.1.0-r4.ebuild index fbe924a5660e..9ede38c06816 100644 --- a/dev-ruby/slim/slim-4.1.0-r3.ebuild +++ b/dev-ruby/slim/slim-4.1.0-r4.ebuild @@ -22,8 +22,11 @@ SLOT="$(ver_cut 1)" KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="doc" -ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:* - >=dev-ruby/temple-0.7.6:0.7" +ruby_add_rdepend " + !dev-ruby/slim:5 + >=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:* + >=dev-ruby/temple-0.7.6:0.7 +" ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )" diff --git a/dev-ruby/slim/slim-5.1.0.ebuild b/dev-ruby/slim/slim-5.1.0-r1.ebuild similarity index 98% rename from dev-ruby/slim/slim-5.1.0.ebuild rename to dev-ruby/slim/slim-5.1.0-r1.ebuild index d556bffba84e..34faaf560467 100644 --- a/dev-ruby/slim/slim-5.1.0.ebuild +++ b/dev-ruby/slim/slim-5.1.0-r1.ebuild @@ -19,11 +19,12 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa HOMEPAGE="https://slim-template.github.io/"; LICENSE="MIT" -SLOT="$(ver_cut 1)" +SLOT="4" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" IUSE="doc" ruby_add_rdepend " + !dev-ruby/slim:5 >=dev-ruby/tilt-2.0.6:* >=dev-ruby/temple-0.7.6:0.7 "
