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 AC4E615802F for ; Sun, 2 Apr 2023 05:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BD00E07A7; Sun, 2 Apr 2023 05:07:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03020E07A7 for ; Sun, 2 Apr 2023 05:07:05 +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 2C68D340EF8 for ; Sun, 2 Apr 2023 05:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A66F68D7 for ; Sun, 2 Apr 2023 05:07:01 +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: <1680411979.0db4ac351489627496f1c432d1f9d5d5323c62c1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/thor/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/thor/thor-1.2.1-r1.ebuild dev-ruby/thor/thor-1.2.1.ebuild X-VCS-Directories: dev-ruby/thor/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0db4ac351489627496f1c432d1f9d5d5323c62c1 X-VCS-Branch: master Date: Sun, 2 Apr 2023 05:07:01 +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: ef2f5728-9879-4293-bf67-fae960b09d84 X-Archives-Hash: ac842a3fc9cae99148ba5e807735263b commit: 0db4ac351489627496f1c432d1f9d5d5323c62c1 Author: Sam James gentoo org> AuthorDate: Sun Apr 2 03:03:42 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 2 05:06:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db4ac35 dev-ruby/thor: cleanup ruby27-only USE_RUBY for tests We have a hack in dev-ruby/thor to avoid too many test dependencies when porting to a newer Ruby, which is fine (we do it for Python all the time too), but in this case, it only contains now-removed (or about to be removed) Rubies. After 92902571781915a800816c1a89e68c3d1b9cad94, this is no longer ignored when we try to cleanup/mask/disable old Rubies. Upon reflection, I think this is the right behaviour: 1. If real runtime dependencies are only needed for older Rubies then we want to clean up the condition once it's useless, not ignore it; 2. If test conditions are only used for old rubies, we either want to clean it up (because it's obsolete) or fix it (if we left a trick behind when bootstrapping a new Ruby, as it means we're not testing it). While at it, add a comment explaining what we're doing, as it's a useful thing to know about. Bonus: in this case, it was obscuring a real issue - we weren't running tests for >=ruby30 long after ruby30 got added and we missed that the hash tests failed. Signed-off-by: Sam James gentoo.org> dev-ruby/thor/thor-1.2.1-r1.ebuild | 4 ++++ dev-ruby/thor/thor-1.2.1.ebuild | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dev-ruby/thor/thor-1.2.1-r1.ebuild b/dev-ruby/thor/thor-1.2.1-r1.ebuild index c37062054e0e..08ba908ee3ce 100644 --- a/dev-ruby/thor/thor-1.2.1-r1.ebuild +++ b/dev-ruby/thor/thor-1.2.1-r1.ebuild @@ -23,6 +23,10 @@ SLOT="$(ver_cut 1)" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux" IUSE="doc" +# For initial target porting (new rubies), we can make these test deps +# conditional with: +# 1. USE_RUBY="" ruby_add_bdepend ... +# 2. skip logic in each_ruby_test USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend " test? ( dev-ruby/childlabor diff --git a/dev-ruby/thor/thor-1.2.1.ebuild b/dev-ruby/thor/thor-1.2.1.ebuild index e6d6b567ebcb..833e26c3ca37 100644 --- a/dev-ruby/thor/thor-1.2.1.ebuild +++ b/dev-ruby/thor/thor-1.2.1.ebuild @@ -23,11 +23,16 @@ SLOT="$(ver_cut 1)" KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux" IUSE="doc" -USE_RUBY="ruby26 ruby27" ruby_add_bdepend " +# For initial target porting (new rubies), we can make these test deps +# conditional with: +# 1. USE_RUBY="" ruby_add_bdepend ... +# 2. skip logic in each_ruby_test +ruby_add_bdepend " test? ( dev-ruby/childlabor dev-ruby/webmock - )" + ) +" RDEPEND+=" !