From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- eclass/Manifest.gz | Bin 37453 -> 37449 bytes eclass/cmake-multilib.eclass | 4 ++-- eclass/ruby-utils.eclass | 6 +++++- eclass/systemd.eclass | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 741ab8a9020c..c17e191b837d 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 7c65e11536b3..9d617900b736 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -6,7 +6,7 @@ # gx86-multilib team # @AUTHOR: # Author: Michał Górny -# @SUPPORTED_EAPIS: 6 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: cmake-utils wrapper for multilib builds # @DESCRIPTION: # The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5) @@ -20,7 +20,7 @@ # phase rather than 'default'. case ${EAPI:-0} in - 6) ;; + [67]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass index 1b3d5a51e633..4406724f380f 100644 --- a/eclass/ruby-utils.eclass +++ b/eclass/ruby-utils.eclass @@ -31,7 +31,7 @@ if [[ ! ${_RUBY_UTILS} ]]; then RUBY_TARGETS_PREFERENCE="ruby24 ruby23 " # All other active ruby targets -RUBY_TARGETS_PREFERENCE+="ruby25" +RUBY_TARGETS_PREFERENCE+="ruby25 ruby26" _ruby_implementation_depend() { @@ -71,6 +71,10 @@ _ruby_implementation_depend() { rubypn="dev-lang/ruby" rubyslot=":2.5" ;; + ruby26) + rubypn="dev-lang/ruby" + rubyslot=":2.6" + ;; ree18) rubypn="dev-lang/ruby-enterprise" rubyslot=":1.8" diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 9a5abfeac900..04f277e94d64 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -468,8 +468,8 @@ systemd_reenable() { type systemctl &>/dev/null || return 0 local x for x; do - if systemctl --quiet --root="${ROOT}" is-enabled "${x}"; then - systemctl --root="${ROOT}" reenable "${x}" + if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then + systemctl --root="${ROOT:-/}" reenable "${x}" fi done } -- cgit v1.2.3