From 1735f74e0bebc3a51ab8ba0e6af83b5234111653 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Wed, 23 Sep 2020 14:54:45 -0400
Subject: [PATCH] fix ruby:2.6 migration

typo fix, remove the package oddly keeping ruby 2.5 around for no
reason, fix emerge flags to be sensible for revdep-rebuild
---
 scripts/pentoo-updater.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh
index a3e525149..d89443a06 100755
--- a/scripts/pentoo-updater.sh
+++ b/scripts/pentoo-updater.sh
@@ -400,11 +400,11 @@ main_checks() {
 
   #migrate what we can from ruby 2.4
   if [ -n "$(portageq match / '<dev-lang/ruby-2.5')" ]; then
-    revdep-rebuild --library 'libruby24.so.2.4' -- --buildpkg=y --usepkg=n --changed-deps --exclude ruby
+    revdep-rebuild --library 'libruby24.so.2.4' -- --buildpkg=y --usepkg=n --exclude ruby
   fi
   #and then ruby 2.5
   if [ -n "$(portageq match / '<dev-lang/ruby-2.6')" ]; then
-    revdep-rebuild --library 'libruby24.so.2.5' -- --buildpkg=y --usepkg=n --changed-deps --exclude ruby
+    revdep-rebuild --library 'libruby25.so.2.5' -- --buildpkg=y --usepkg=n --exclude ruby
   fi
 
   #before we begin main installs, let's remove what may need removing
@@ -449,6 +449,11 @@ main_checks() {
     printf "Removing conflicting bundler\n"
     emerge -C "<dev-ruby/bundler-1.17.3-r1"
   fi
+  removeme9=$(portageq match / '<=dev-ruby/did_you_mean-1.3.1')
+  if [ -n "${removeme9}" ]; then
+    printf "Removing old did_you_mean\n"
+    emerge -C "<dev-ruby/did_you_mean-1.3.1"
+  fi
 
   #before main upgrades, let's set a good java-vm
   set_java