diff options
| author |   Sam James <sam@gentoo.org> | 2023-04-25 03:16:10 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-04-25 03:17:39 +0100 |
| commit | 03a57709708195c17c54966634cdfd51acc905b7 (patch) | |
| tree | e7916feaca5ada338f2d37ee0bc75f246cf91153 /dev-vcs | |
| parent | dev-python/cffi: Stabilize 1.15.1-r2 sparc, #904937 (diff) | |
| download | gentoo-03a57709708195c17c54966634cdfd51acc905b7.tar.gz gentoo-03a57709708195c17c54966634cdfd51acc905b7.tar.bz2 gentoo-03a57709708195c17c54966634cdfd51acc905b7.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/subversion/subversion-1.14.2-r1.ebuild | 6 |
1 files 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 } |