From 61f10f985e19dfe20a4d9552902625edd5b6eabb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 21 Jun 2021 17:32:00 +0100 Subject: gentoo resync : 21.06.2021 --- eclass/chromium-2.eclass | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'eclass/chromium-2.eclass') diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass index b3d63f302d05..54df3b1394c7 100644 --- a/eclass/chromium-2.eclass +++ b/eclass/chromium-2.eclass @@ -1,14 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: chromium-2.eclass # @MAINTAINER: -# Chromium Herd +# Chromium Project # @AUTHOR: # Mike Gilbert +# @SUPPORTED_EAPIS: 7 # @BLURB: Shared functions for chromium and google-chrome -inherit eutils linux-info +case ${EAPI} in + 7) ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; +esac + +inherit linux-info + +if [[ -z ${_CHROMIUM_2_ECLASS} ]]; then +_CHROMIUM_2_ECLASS=1 if [[ ${PN} == chromium ]]; then IUSE+=" custom-cflags" @@ -19,8 +28,6 @@ fi # @DESCRIPTION: # Ensures the system kernel supports features needed for SUID sandbox to work. chromium_suid_sandbox_check_kernel_config() { - has "${EAPI:-0}" 0 1 2 3 && die "EAPI=${EAPI} is not supported" - if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then # Warn if the kernel does not support features needed for sandboxing. # Bug #363987. @@ -44,8 +51,6 @@ chromium_suid_sandbox_check_kernel_config() { # List of language packs available for this package. _chromium_set_l10n_IUSE() { - [[ ${EAPI:-0} == 0 ]] && die "EAPI=${EAPI} is not supported" - local lang for lang in ${CHROMIUM_LANGS}; do # Default to enabled since we bundle them anyway. @@ -176,3 +181,5 @@ gyp_use() { local gypflag="-D${2:-use_${1//-/_}}=" usex "$1" "${gypflag}" "${gypflag}" "${3-1}" "${4-0}" } + +fi -- cgit v1.2.3