From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFCFA15800C for ; Mon, 3 Apr 2023 05:08:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EFADE084A; Mon, 3 Apr 2023 05:08:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB4FEE084A for ; Mon, 3 Apr 2023 05:08:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D82F340BD3 for ; Mon, 3 Apr 2023 05:08:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8144A1A for ; Mon, 3 Apr 2023 05:08:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1680498465.487957e2cb32ee5ab9db08970d029a5f565f2d94.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/slim/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/slim/slim-4.1.0-r3.ebuild dev-ruby/slim/slim-4.1.0-r4.ebuild dev-ruby/slim/slim-5.1.0-r1.ebuild dev-ruby/slim/slim-5.1.0.ebuild X-VCS-Directories: dev-ruby/slim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 487957e2cb32ee5ab9db08970d029a5f565f2d94 X-VCS-Branch: master Date: Mon, 3 Apr 2023 05:08:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e04bf650-c1bf-40bf-ba40-2a53826f24bf X-Archives-Hash: fd9f79d97788d10694fc4790a5f8f27a commit: 487957e2cb32ee5ab9db08970d029a5f565f2d94 Author: Sam James gentoo org> AuthorDate: Mon Apr 3 04:08:03 2023 +0000 Commit: Sam James gentoo 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 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 "