From 2f51c9978dda4c6e8debca43e4235ecc86914032 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 25 Dec 2017 17:37:52 +0000
Subject: gentoo resync : 25.12.2017

---
 eclass/Manifest.gz       | Bin 41521 -> 41533 bytes
 eclass/ruby-ng.eclass    |   7 +------
 eclass/ruby-utils.eclass |   6 +++++-
 eclass/toolchain.eclass  |   2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 34ffa0770fff..cfc9704ceecb 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index e9d0f33e5580..8d6f0082b9e8 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -13,12 +13,7 @@
 # The Ruby eclass is designed to allow an easier installation of Ruby packages
 # and their incorporation into the Gentoo Linux system.
 #
-# Currently available targets are:
-#  * ruby21 - Ruby (MRI) 2.1.x
-#  * ruby22 - Ruby (MRI) 2.2.x
-#  * ruby23 - Ruby (MRI) 2.3.x
-#  * ruby24 - Ruby (MRI) 2.4.x
-#  * rbx    - Rubinius
+# Currently available targets are listed in ruby-utils.eclass
 #
 # This eclass does not define the implementation of the configure,
 # compile, test, or install phases. Instead, the default phases are
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 854ce06ac050..e4a072a0972e 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -28,7 +28,7 @@ if [[ ! ${_RUBY_UTILS} ]]; then
 # provide for a better first installation experience.
 
 # All RUBY_TARGETS
-RUBY_TARGETS_PREFERENCE="ruby22 ruby21 "
+RUBY_TARGETS_PREFERENCE="ruby22 "
 
 # All other active ruby targets
 RUBY_TARGETS_PREFERENCE+="ruby23 ruby24"
@@ -67,6 +67,10 @@ _ruby_implementation_depend() {
 			rubypn="dev-lang/ruby"
 			rubyslot=":2.4"
 			;;
+		ruby25)
+			rubypn="dev-lang/ruby"
+			rubyslot=":2.5"
+			;;
 		ree18)
 			rubypn="dev-lang/ruby-enterprise"
 			rubyslot=":1.8"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 58d859dfaf32..a038303ec7f5 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1484,7 +1484,7 @@ gcc_do_filter_flags() {
 
 		# "hppa2.0-unknown-linux-gnu" -> hppa2_0_unknown_linux_gnu
 		local VAR="CFLAGS_"${CTARGET//[-.]/_}
-		CXXFLAGS=${!VAR}
+		CXXFLAGS=${!VAR-${CFLAGS}}
 	fi
 
 	export GCJFLAGS=${GCJFLAGS:-${CFLAGS}}
-- 
cgit v1.2.3