commit: c4b4c0a304d107f465f0784f44b7dbcad5794dc1 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sun Dec 25 13:57:24 2022 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Tue Dec 27 06:56:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b4c0a3
dev-ruby/rouge: fix file collision Closes: https://bugs.gentoo.org/876442 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> dev-ruby/rouge/{rouge-4.0.0.ebuild => rouge-3.30.0-r1.ebuild} | 5 +++-- dev-ruby/rouge/rouge-4.0.0.ebuild | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-ruby/rouge/rouge-4.0.0.ebuild b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild similarity index 92% copy from dev-ruby/rouge/rouge-4.0.0.ebuild copy to dev-ruby/rouge/rouge-3.30.0-r1.ebuild index 8a8603696fdb..a2b51d86f9d6 100644 --- a/dev-ruby/rouge/rouge-4.0.0.ebuild +++ b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby27 ruby30 ruby31" +USE_RUBY="ruby26 ruby27 ruby30 ruby31" +RUBY_FAKEGEM_BINWRAP="" RUBY_FAKEGEM_TASK_TEST="spec" RUBY_FAKEGEM_RECIPE_DOC="yard" @@ -17,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -SLOT="$(ver_cut 1)" +SLOT="2" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="" diff --git a/dev-ruby/rouge/rouge-4.0.0.ebuild b/dev-ruby/rouge/rouge-4.0.0.ebuild index 8a8603696fdb..4d36fc3162b8 100644 --- a/dev-ruby/rouge/rouge-4.0.0.ebuild +++ b/dev-ruby/rouge/rouge-4.0.0.ebuild @@ -26,7 +26,7 @@ ruby_add_bdepend "doc? ( dev-ruby/redcarpet ) dev-ruby/yard " -ruby_add_rdepend "dev-ruby/redcarpet" +ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1" all_ruby_prepare() { rm -f tasks/{check/style,update/changelog}.rake || die
