From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D56F3158017 for ; Tue, 28 Sep 2021 08:45:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9153E0960; Tue, 28 Sep 2021 08:45:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0561E0960 for ; Tue, 28 Sep 2021 08:45:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAE81342AB5 for ; Tue, 28 Sep 2021 08:45:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33758111 for ; Tue, 28 Sep 2021 08:45:30 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1632818723.7241b979621c5bd69b0c84171fdaa7bf8c916102.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/mozcoreconf-v6.eclass X-VCS-Directories: eclass/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7241b979621c5bd69b0c84171fdaa7bf8c916102 X-VCS-Branch: master Date: Tue, 28 Sep 2021 08:45:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 654ee445-4254-48ae-9de8-93af0a738e7c X-Archives-Hash: 84ce8edd82292d99e4f430fd0c791d0b commit: 7241b979621c5bd69b0c84171fdaa7bf8c916102 Author: Lars Wendler gentoo org> AuthorDate: Tue Sep 28 07:34:42 2021 +0000 Commit: Lars Wendler gentoo 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 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 -# @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 }