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 7F7F715ACFB for ; Tue, 25 Apr 2023 02:18:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99DDFE0972; Tue, 25 Apr 2023 02:18:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 7E0D8E0972 for ; Tue, 25 Apr 2023 02:18:15 +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 86A67340EE0 for ; Tue, 25 Apr 2023 02:18:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CFB46A49 for ; Tue, 25 Apr 2023 02:18:12 +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: <1682389059.03a57709708195c17c54966634cdfd51acc905b7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/subversion/subversion-1.14.2-r1.ebuild X-VCS-Directories: dev-vcs/subversion/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03a57709708195c17c54966634cdfd51acc905b7 X-VCS-Branch: master Date: Tue, 25 Apr 2023 02:18:12 +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: 3d03c03b-200a-4453-9fd4-af41b91a925d X-Archives-Hash: bb900f5f392a2eedd4ed009b0835eae4 commit: 03a57709708195c17c54966634cdfd51acc905b7 Author: Sam James gentoo org> AuthorDate: Tue Apr 25 02:16:10 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 25 02:17:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a57709 dev-vcs/subversion: tweak ruby detection logic - Prefer newer/later ruby versions (don't bail out early once we find one) - Check for virtual/rubygems too for each ruby See https://forums.gentoo.org/viewtopic-t-1163029.html. Signed-off-by: Sam James gentoo.org> dev-vcs/subversion/subversion-1.14.2-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild index b5d43cf56b8c..2a9b803e1b87 100644 --- a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild +++ b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild @@ -134,12 +134,12 @@ pkg_setup() { local rbslot RB_VER="" for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do - if has_version dev-lang/ruby:${rbslot} ; then + # No break here as we want to pick the best (latest) + if has_version "dev-lang/ruby:${rbslot}" && has_version "virtual/rubygems[ruby_targets_ruby${rbslot}(-)]" ; then RB_VER="${rbslot/.}" - break fi done - [[ -z "${RB_VER}" ]] && die "No useable ruby version found" + [[ -z "${RB_VER}" ]] && die "No usable ruby version found" fi }