commit: 7241b979621c5bd69b0c84171fdaa7bf8c916102 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Sep 28 07:34:42 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Sep 28 08:45:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7241b979
mozcoreconf-v6.eclass: Support EAPI-8 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> eclass/mozcoreconf-v6.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass index 95fce0f0258..250f49bd58b 100644 --- a/eclass/mozcoreconf-v6.eclass +++ b/eclass/mozcoreconf-v6.eclass @@ -4,7 +4,7 @@ # @ECLASS: mozcoreconf-v6.eclass # @MAINTAINER: # Mozilla team <[email protected]> -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: core options and configuration functions for mozilla # @DESCRIPTION: # @@ -28,7 +28,7 @@ case "${EAPI:-0}" in inherit multilib versionator DEPEND+=" ${BDEPEND}" ;; - 7) + 7|8) ;; *) die "EAPI ${EAPI} is not supported, contact eclass maintainers" @@ -120,7 +120,8 @@ moz_pkgsetup() { # workaround to set python3 into PYTHON3 until mozilla doesn't need py2 if [[ "${PYTHON_COMPAT[@]}" != "${PYTHON_COMPAT[@]#python3*}" ]]; then export PYTHON3=${PYTHON} - python_export python2_7 PYTHON EPYTHON + export PYTHON=python2.7 + export EPYTHON="${EPREFIX}"/usr/bin/python2.7 fi }
