commit: 6d8aacbe58de94ea8ed04e6078b5c159907f99b4
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Fri Apr 8 13:15:56 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon Apr 11 09:40:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d8aacbe
qbs.eclass: fix inherit guard usage
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
eclass/qbs.eclass | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/eclass/qbs.eclass b/eclass/qbs.eclass
index 6c3f06310..af5709e26 100644
--- a/eclass/qbs.eclass
+++ b/eclass/qbs.eclass
@@ -12,16 +12,22 @@
# @DESCRIPTION:
# Utility eclass providing wrapper functions for Qbs build system.
-if [[ ! ${_QBS_ECLASS} ]]; then
-
-case ${EAPI} in
+case ${EAPI:-0} in
8) ;;
- *) die "${ECLASS}: EAPI ${EAPI} unsupported."
+ *) die "${ECLASS}: EAPI ${EAPI:-0} unsupported."
esac
+if [[ ! ${_QBS_ECLASS} ]]; then
+
inherit multiprocessing toolchain-funcs qmake-utils
-# @ECLASS-VARIABLE: QBS_COMMAND_ECHO_MODE
+fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_install
+
+if [[ ! ${_QBS_ECLASS} ]]; then
+
+# @ECLASS_VARIABLE: QBS_COMMAND_ECHO_MODE
# @USER_VARIABLE
# @DESCRIPTION:
# Determines what kind of output to show when executing commands. Possible
@@ -38,8 +44,6 @@ inherit multiprocessing toolchain-funcs qmake-utils
BDEPEND="dev-util/qbs"
-EXPORT_FUNCTIONS src_configure src_compile src_install
-
# @FUNCTION: eqbs
# @USAGE: [<qbs args>...]
# @DESCRIPTION:
