From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id CE6A91581FD for ; Sat, 06 Sep 2025 21:32:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id AB9D0340EC3 for ; Sat, 06 Sep 2025 21:32:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9C9DF1103BA; Sat, 06 Sep 2025 21:32:20 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 8DD981103BA for ; Sat, 06 Sep 2025 21:32:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 45383340EC3 for ; Sat, 06 Sep 2025 21:32:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8C7B38C9 for ; Sat, 06 Sep 2025 21:32:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1757194154.e9e6d8c367fdf02b14f9cb2a59489833975d1445.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e9e6d8c367fdf02b14f9cb2a59489833975d1445 X-VCS-Branch: master Date: Sat, 06 Sep 2025 21:32:18 +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: f9a0d4ea-bf59-4f3f-ac91-03f00f8192bf X-Archives-Hash: d3897ab40fd5422b24dc44c8404799b7 commit: e9e6d8c367fdf02b14f9cb2a59489833975d1445 Author: Nicolas PARLANT parhuet fr> AuthorDate: Fri Mar 7 15:53:35 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 6 21:29:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e6d8c3 toolchain.eclass: drop support EAPI 7 should only supports EAPI=8 since rust was introduced in inherit. Signed-off-by: Nicolas PARLANT parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/40954 Closes: https://github.com/gentoo/gentoo/pull/40954 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 9e79d3de9f28..5d7bf2a67547 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -4,7 +4,7 @@ # @ECLASS: toolchain.eclass # @MAINTAINER: # Toolchain Ninjas -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: Common code for sys-devel/gcc ebuilds # @DESCRIPTION: # Common code for sys-devel/gcc ebuilds (and occasionally GCC forks, like @@ -17,7 +17,7 @@ _TOOLCHAIN_ECLASS=1 RUST_OPTIONAL="1" case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -463,13 +463,8 @@ PDEPEND=">=sys-devel/gcc-config-2.11" # @ECLASS_VARIABLE: TOOLCHAIN_PATCH_SUFFIX # @DESCRIPTION: # Used to override compression used for for patchsets. -# Default is xz for EAPI 8+ and bz2 for older EAPIs. -if [[ ${EAPI} == 8 ]] ; then +# Default is xz for EAPI 8+. : "${TOOLCHAIN_PATCH_SUFFIX:=xz}" -else - # Older EAPIs - : "${TOOLCHAIN_PATCH_SUFFIX:=bz2}" -fi # @ECLASS_VARIABLE: TOOLCHAIN_SET_S # @DESCRIPTION: @@ -766,11 +761,10 @@ do_gcc_gentoo_patches() { fi fi - local shopt_save=$(shopt -p nullglob) + local - shopt -s nullglob einfo "Applying musl patches ..." eapply "${WORKDIR}"/musl/{,nocross/}*.patch - ${shopt_save} fi #