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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A041C158086 for ; Tue, 11 Jan 2022 22:24:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E60832BC057; Tue, 11 Jan 2022 22:24:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12A542BC038 for ; Tue, 11 Jan 2022 22:24:24 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH v2 1/5] multilib-minimal.eclass: remove EAPI 5 Date: Tue, 11 Jan 2022 23:24:09 +0100 Message-Id: <20220111222413.5291-1-soap@gentoo.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: d95729e9-809e-4803-a118-9d0af47cf523 X-Archives-Hash: 72d6b26e6c27c72dfec4cb9595b3ae4b Signed-off-by: David Seifert --- eclass/multilib-minimal.eclass | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 9a1efe2cc46..97c8d618c42 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-minimal.eclass # @MAINTAINER: # Michał Górny -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @PROVIDES: multilib-build # @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions # @DESCRIPTION: @@ -23,18 +23,15 @@ # # If you need generic install rules, use multilib_src_install_all function. - -case ${EAPI} in - 5|6|7|8) ;; +case ${EAPI:-0} in + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac - -[[ ${EAPI} == 5 ]] && inherit eutils inherit multilib-build -EXPORT_FUNCTIONS src_configure src_compile src_test src_install - +if [[ ! ${_MULTILIB_MINIMAL_ECLASS} ]]; then +_MULTILIB_MINIMAL_ECLASS=1 multilib-minimal_src_configure() { debug-print-function ${FUNCNAME} "$@" @@ -123,3 +120,7 @@ multilib-minimal_src_install() { einstalldocs fi } + +fi + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install -- 2.34.1