commit:     aba2bb5d2dd63c88960e70b10f1e9a213a8eaffb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 16:30:17 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 16:30:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba2bb5d

waf-utils.eclass: drop EAPI 6 support

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 eclass/waf-utils.eclass | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 2f4a20cd4571..1be02bbea3cb 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -8,20 +8,23 @@
 # Original Author: Gilles Dartiguelongue <[email protected]>
 # Various improvements based on cmake-utils.eclass: Tomáš Chvátal 
<[email protected]>
 # Proper prefix support: Jonathan Callen <[email protected]>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: common ebuild functions for waf-based packages
 # @DESCRIPTION:
 # The waf-utils eclass contains functions that make creating ebuild for
 # waf-based packages much easier.
 # Its main features are support of common portage default settings.
 
-inherit multilib toolchain-funcs multiprocessing
-
-case ${EAPI:-0} in
-       6|7|8) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
-       *) die "EAPI=${EAPI} is not supported" ;;
+case ${EAPI} in
+       7|8) ;;
+       *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_WAF_UTILS_ECLASS} ]]; then
+_WAF_UTILS_ECLASS=1
+
+inherit multilib toolchain-funcs multiprocessing
+
 # @ECLASS_VARIABLE: WAF_VERBOSE
 # @USER_VARIABLE
 # @DESCRIPTION:
@@ -141,3 +144,7 @@ waf-utils_src_install() {
        # Manual document installation
        einstalldocs
 }
+
+fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_install

Reply via email to