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 A492815ACFC for ; Mon, 10 Apr 2023 09:04:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1C4CE07AE; Mon, 10 Apr 2023 09:04:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B59F3E07AE for ; Mon, 10 Apr 2023 09:04:11 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9FD3340CB1 for ; Mon, 10 Apr 2023 09:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 361F8A19 for ; Mon, 10 Apr 2023 09:04:09 +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: <1681117402.711ab5dcbb20007552471868517ad3548e97f72c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/racc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/racc/racc-1.6.2.ebuild X-VCS-Directories: dev-ruby/racc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 711ab5dcbb20007552471868517ad3548e97f72c X-VCS-Branch: master Date: Mon, 10 Apr 2023 09:04:09 +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: 54d70262-0039-4031-bef7-70858eefcdcf X-Archives-Hash: 4243cc1b89dbd0008c837c74dcbe1acd commit: 711ab5dcbb20007552471868517ad3548e97f72c Author: Sam James gentoo org> AuthorDate: Mon Apr 10 09:00:55 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 10 09:03:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711ab5dc dev-ruby/racc: run rake for a valid Ruby This is a hack but given racc is needed by Ruby itself, our eselect stuff won't have had a chance to run yet (like it does when an old Ruby slot gets depcleaned). So, go with it to avoid breaking upgrades during the transition :( Signed-off-by: Sam James gentoo.org> dev-ruby/racc/racc-1.6.2.ebuild | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-ruby/racc/racc-1.6.2.ebuild b/dev-ruby/racc/racc-1.6.2.ebuild index ecf5e73559a8..a568aa1d0569 100644 --- a/dev-ruby/racc/racc-1.6.2.ebuild +++ b/dev-ruby/racc/racc-1.6.2.ebuild @@ -36,10 +36,18 @@ all_ruby_prepare() { # Avoid depending on rake-compiler since we don't use it to compile # the extension. - sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile - sed -i -e '/ExtensionTask/,/^ end/ s:^:#:' Rakefile - # Which means we need to generate the parser file here - rake lib/racc/parser-text.rb || die + sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile || die + sed -i -e '/ExtensionTask/,/^ end/ s:^:#:' Rakefile || die + + # ...which means we need to generate the parser file here + for ruby in ${USE_RUBY} ; do + if use ruby_targets_${ruby} ; then + if has_version -b "virtual/rubygems[ruby_targets_${ruby}(-)]" && has_version -b "dev-ruby/rake[ruby_targets_${ruby}(-)]" ; then + ${ruby} -S rake lib/racc/parser-text.rb || die + break + fi + fi + done sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die }