| 1 |
commit: 7241b979621c5bd69b0c84171fdaa7bf8c916102 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 28 07:34:42 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 28 08:45:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7241b979 |
| 7 |
|
| 8 |
mozcoreconf-v6.eclass: Support EAPI-8 |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/mozcoreconf-v6.eclass | 7 ++++--- |
| 13 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass |
| 16 |
index 95fce0f0258..250f49bd58b 100644 |
| 17 |
--- a/eclass/mozcoreconf-v6.eclass |
| 18 |
+++ b/eclass/mozcoreconf-v6.eclass |
| 19 |
@@ -4,7 +4,7 @@ |
| 20 |
# @ECLASS: mozcoreconf-v6.eclass |
| 21 |
# @MAINTAINER: |
| 22 |
# Mozilla team <mozilla@g.o> |
| 23 |
-# @SUPPORTED_EAPIS: 6 7 |
| 24 |
+# @SUPPORTED_EAPIS: 6 7 8 |
| 25 |
# @BLURB: core options and configuration functions for mozilla |
| 26 |
# @DESCRIPTION: |
| 27 |
# |
| 28 |
@@ -28,7 +28,7 @@ case "${EAPI:-0}" in |
| 29 |
inherit multilib versionator |
| 30 |
DEPEND+=" ${BDEPEND}" |
| 31 |
;; |
| 32 |
- 7) |
| 33 |
+ 7|8) |
| 34 |
;; |
| 35 |
*) |
| 36 |
die "EAPI ${EAPI} is not supported, contact eclass maintainers" |
| 37 |
@@ -120,7 +120,8 @@ moz_pkgsetup() { |
| 38 |
# workaround to set python3 into PYTHON3 until mozilla doesn't need py2 |
| 39 |
if [[ "${PYTHON_COMPAT[@]}" != "${PYTHON_COMPAT[@]#python3*}" ]]; then |
| 40 |
export PYTHON3=${PYTHON} |
| 41 |
- python_export python2_7 PYTHON EPYTHON |
| 42 |
+ export PYTHON=python2.7 |
| 43 |
+ export EPYTHON="${EPREFIX}"/usr/bin/python2.7 |
| 44 |
fi |
| 45 |
} |
Archives