diff options
| author |   Sam James <sam@gentoo.org> | 2023-04-03 05:08:03 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-04-03 06:07:45 +0100 |
| commit | 487957e2cb32ee5ab9db08970d029a5f565f2d94 (patch) | |
| tree | 597e60f39b006dd4a4cbcc2dbca34aad5f24811d | |
| parent | dev-ruby/loquacious: enable ruby32 (diff) | |
| download | gentoo-487957e2cb32ee5ab9db08970d029a5f565f2d94.tar.gz gentoo-487957e2cb32ee5ab9db08970d029a5f565f2d94.tar.bz2 gentoo-487957e2cb32ee5ab9db08970d029a5f565f2d94.zip | |
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@gentoo.org>
| -rw-r--r-- | dev-ruby/slim/slim-4.1.0-r4.ebuild (renamed from dev-ruby/slim/slim-4.1.0-r3.ebuild) | 7 | ||||
| -rw-r--r-- | dev-ruby/slim/slim-5.1.0-r1.ebuild (renamed from dev-ruby/slim/slim-5.1.0.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 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 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 " |