commit: 03a57709708195c17c54966634cdfd51acc905b7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Apr 25 02:16:10 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 }
