diff --git a/dev-ruby/rake/rake-13.0.6-r1.ebuild b/dev-ruby/rake/rake-13.0.6-r2.ebuild
similarity index 100%
rename from dev-ruby/rake/rake-13.0.6-r1.ebuild
rename to dev-ruby/rake/rake-13.0.6-r2.ebuild
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 77d2163e06fde..db3db300c0238 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -400,10 +400,10 @@ ruby_fakegem_binwrapper() {
 		# in the shebang, and we can actually avoid errors when
 		# calling the script by default.
 		local rubycmd=
-		for implementation in $(_ruby_get_all_impls); do
+		for implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
 			# ignore non-enabled implementations
 			use ruby_targets_${implementation} || continue
-			if [ -z $rubycmd ]; then
+			if [[ -z ${rubycmd} ]]; then
 				# if no other implementation was set before, set it.
 				rubycmd="$(ruby_implementation_command ${implementation})"
 			else