From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1696281-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 863341581F3
	for <garchives@archives.gentoo.org>; Mon,  2 Dec 2024 01:39:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C6A4BE079C;
	Mon,  2 Dec 2024 01:38:59 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 A4E0EE079C
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Dec 2024 01:38:58 +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 6ED37341214
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Dec 2024 01:38:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CDA57D81
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Dec 2024 01:38:55 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1733103516.395166713e5f118988b25b9476e36cddb6fb0fbb.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, sys-devel/gcc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/toolchain.eclass sys-devel/gcc/metadata.xml
X-VCS-Directories: eclass/ sys-devel/gcc/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 395166713e5f118988b25b9476e36cddb6fb0fbb
X-VCS-Branch: master
Date: Mon,  2 Dec 2024 01:38:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8766a64b-b386-488b-be50-016777c47ef6
X-Archives-Hash: ba3492fc02e7b96af630718d035b2d8a

commit:     395166713e5f118988b25b9476e36cddb6fb0fbb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  2 01:37:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 01:38:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39516671

toolchain.eclass: rename libdiagnostics -> libgdiagnostics

This was only added last week so no transition/compatibility stuff here.

It was renamed upstream because Debian reported a library called libdiagnostics
already existed.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass    | 8 ++++----
 sys-devel/gcc/metadata.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 114a008b700f..be8bfcddfafd 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -338,7 +338,7 @@ if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] ; then
 	# it was disabled in 13.
 	tc_version_is_at_least 14.0.0_pre20230423 ${PV} && IUSE+=" rust" TC_FEATURES+=( rust )
 	tc_version_is_at_least 14.2.1_p20241026 ${PV} && IUSE+=" time64"
-	tc_version_is_at_least 15.0.0_pre20241124 ${PV} && IUSE+=" libdiagnostics"
+	tc_version_is_at_least 15.0.0_pre20241124 ${PV} && IUSE+=" libgdiagnostics"
 fi
 
 if tc_version_is_at_least 10; then
@@ -1836,8 +1836,8 @@ toolchain_src_configure() {
 		gcc_shell="${BROOT}"/bin/sh
 	fi
 
-	if is_jit || _tc_use_if_iuse libdiagnostics ; then
-		einfo "Configuring shared gcc for JIT/libdiagnostics"
+	if is_jit || _tc_use_if_iuse libgdiagnostics ; then
+		einfo "Configuring shared gcc for JIT/libgdiagnostics"
 
 		local confgcc_jit=(
 			"${confgcc[@]}"
@@ -1874,7 +1874,7 @@ toolchain_src_configure() {
 		)
 
 		if tc_version_is_at_least 15.0.0_pre20241124 ${PV} ; then
-			confgcc_jit+=( $(use_enable libdiagnostics) )
+			confgcc_jit+=( $(use_enable libgdiagnostics) )
 		fi
 
 		if tc_version_is_at_least 13.1 ; then

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index eeb3aa4d7aa0..9b51b891ae5e 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -77,7 +77,7 @@
 		<flag name="graphite">Add support for the framework for loop optimizations based on a polyhedral intermediate representation</flag>
 		<flag name="ieee-long-double">Use accelerated 128-bit IEEE long double ABI (ppc64le only)</flag>
 		<flag name="jit">Enable libgccjit so other applications can embed gcc for Just-In-Time compilation.</flag>
-		<flag name="libdiagnostics">Provide libdiagnostics (https://gcc.gnu.org/wiki/libdiagnostics). This also installs the 'sarif-replay' tool.</flag>
+		<flag name="libgdiagnostics">Provide libgdiagnostics (https://gcc.gnu.org/wiki/libgdiagnostics). This also installs the 'sarif-replay' tool.</flag>
 		<flag name="libssp">Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
 		<flag name="lto">
 			Build using Link Time Optimizations (LTO).