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 284541581FB for ; Tue, 27 Aug 2024 15:19:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C863E2A71; Tue, 27 Aug 2024 15:16: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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F1E3E2A6D for ; Tue, 27 Aug 2024 15:16:25 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 10/50] fortran-2.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:14:55 +0200 Message-ID: <20240827151553.210835-10-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-1-soap@gentoo.org> 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-Transfer-Encoding: 8bit X-Archives-Salt: bde87582-d125-439f-9985-b886853f4117 X-Archives-Hash: 5a147df26a60a8084951a454e12fdfc0 Signed-off-by: David Seifert --- eclass/fortran-2.eclass | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 855dcba59a39..0538bfd49a11 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: fortran-2.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author Justin Lecher # Test functions provided by Sebastien Fabbro and Kacper Kowalik -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Simplify fortran compiler management # @DESCRIPTION: # If you need a fortran compiler, then you should be inheriting this eclass. @@ -27,7 +27,7 @@ # FORTRAN_NEED_OPENMP=1 case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -66,9 +66,7 @@ inherit toolchain-funcs for _f_use in ${FORTRAN_NEEDED}; do case ${_f_use} in always) - if [[ ${EAPI} != [56] ]]; then - BDEPEND+=" virtual/fortran" - fi + BDEPEND+=" virtual/fortran" DEPEND+=" virtual/fortran" RDEPEND+=" virtual/fortran" break @@ -77,16 +75,10 @@ for _f_use in ${FORTRAN_NEEDED}; do break ;; test) - if [[ ${EAPI} != [56] ]]; then - BDEPEND+=" ${_f_use}? ( virtual/fortran )" - else - DEPEND+=" ${_f_use}? ( virtual/fortran )" - fi + BDEPEND+=" ${_f_use}? ( virtual/fortran )" ;; *) - if [[ ${EAPI} != [56] ]]; then - BDEPEND+=" ${_f_use}? ( virtual/fortran )" - fi + BDEPEND+=" ${_f_use}? ( virtual/fortran )" DEPEND+=" ${_f_use}? ( virtual/fortran )" RDEPEND+=" ${_f_use}? ( virtual/fortran )" ;; -- 2.46.0