summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin39141 -> 39147 bytes
-rw-r--r--eclass/ruby-ng.eclass2
-rw-r--r--eclass/ruby-utils.eclass6
3 files changed, 2 insertions, 6 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 0ea19027494f..d87b7695843f 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 5cea44101593..d80ae96dd40b 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -111,7 +111,7 @@ _ruby_get_all_impls() {
for i in ${USE_RUBY}; do
case ${i} in
# removed implementations
- ruby19|ruby2[0-7]|jruby)
+ ruby19|ruby2[0-7]|ruby30|jruby)
;;
*)
found_valid_impl=1
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 8a2b7720c951..48d701a3ebc7 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -22,7 +22,6 @@ esac
if [[ ! ${_RUBY_UTILS} ]]; then
-
# @ECLASS_VARIABLE: RUBY_TARGETS_PREFERENCE
# @INTERNAL
# @DESCRIPTION:
@@ -33,12 +32,11 @@ if [[ ! ${_RUBY_UTILS} ]]; then
# provide for a better first installation experience.
# All stable RUBY_TARGETS
-RUBY_TARGETS_PREFERENCE="ruby31 ruby30 "
+RUBY_TARGETS_PREFERENCE="ruby31 "
# All other active ruby targets
RUBY_TARGETS_PREFERENCE+="ruby32"
-
_ruby_implementation_depend() {
local rubypn=
local rubyslot=
@@ -66,7 +64,5 @@ _ruby_implementation_depend() {
echo "$2${rubypn}$3${rubyslot}"
}
-
-
_RUBY_UTILS=1
fi