From 59c37162f851a7e1d34e9ad650b624775c18f326 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Oct 2024 07:07:15 +0000 Subject: [PATCH] eclass/ruby-utils: Sync with Gentoo It's from Gentoo commit 1040ec9c3f79e00f688490cfaf91ee6926002ab2. --- .../portage-stable/eclass/ruby-utils.eclass | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass index 81bda3abfb..29b9ab396b 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass @@ -6,7 +6,7 @@ # Ruby team # @AUTHOR: # Author: Hans de Graaff -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: An eclass for supporting ruby scripts and bindings in non-ruby packages # @DESCRIPTION: # The ruby-utils eclass is designed to allow an easier installation of @@ -15,13 +15,10 @@ # This eclass does not set any metadata variables nor export any phase # functions. It can be inherited safely. -if [[ ! ${_RUBY_UTILS} ]]; then +if [[ -z ${_RUBY_UTILS_ECLASS} ]] ; then +_RUBY_UTILS_ECLASS=1 case ${EAPI} in - 5|6) - ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" - ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." - ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -68,5 +65,4 @@ _ruby_implementation_depend() { echo "$2${rubypn}$3${rubyslot}" } -_RUBY_UTILS=1 fi