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 614ED138334 for ; Wed, 15 Aug 2018 07:11:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DCF5E088A; Wed, 15 Aug 2018 07:11:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E21A8E088A for ; Wed, 15 Aug 2018 07:11:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36E44335C0D for ; Wed, 15 Aug 2018 07:11:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 245D63BE for ; Wed, 15 Aug 2018 07:11:07 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1534316746.fe445ca598ccf67e23e6fb4ff2242830777188e0.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/eutils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: fe445ca598ccf67e23e6fb4ff2242830777188e0 X-VCS-Branch: master Date: Wed, 15 Aug 2018 07:11:07 +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-Archives-Salt: 1ff52e39-297c-464e-8a49-aa048eec1329 X-Archives-Hash: a6833777f710d651693ebbb728b32566 commit: fe445ca598ccf67e23e6fb4ff2242830777188e0 Author: Ulrich Müller gentoo org> AuthorDate: Fri Aug 10 16:36:47 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Aug 15 07:05:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe445ca5 eutils.eclass: Disable eqawarn in EAPI 7. The eqawarn command is part of EAPI 7, therefore the eclass should not override it. Also we cannot rely on its being a shell function. eclass/eutils.eclass | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 9b4767e1874..e5d0ebeebb0 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -25,19 +25,6 @@ case ${EAPI:-0} in ;; esac -# @FUNCTION: eqawarn -# @USAGE: [message] -# @DESCRIPTION: -# Proxy to ewarn for package managers that don't provide eqawarn and use the PM -# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev -# profile. -if ! declare -F eqawarn >/dev/null ; then - eqawarn() { - has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@" - : - } -fi - # @FUNCTION: emktemp # @USAGE: [temp dir] # @DESCRIPTION: @@ -415,4 +402,23 @@ in_iuse() { ;; esac +case ${EAPI:-0} in +0|1|2|3|4|5|6) + +# @FUNCTION: eqawarn +# @USAGE: [message] +# @DESCRIPTION: +# Proxy to ewarn for package managers that don't provide eqawarn and use the PM +# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev +# profile. +if ! declare -F eqawarn >/dev/null ; then + eqawarn() { + has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@" + : + } +fi + +;; +esac + fi