From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1607689-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 (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 888CC158041
	for <garchives@archives.gentoo.org>; Wed,  6 Mar 2024 03:37:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EF391E2A03;
	Wed,  6 Mar 2024 03:37:43 +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 B3CE8E2A03
	for <gentoo-commits@lists.gentoo.org>; Wed,  6 Mar 2024 03:37:43 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 670C934306C
	for <gentoo-commits@lists.gentoo.org>; Wed,  6 Mar 2024 03:37:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 7891A14F5
	for <gentoo-commits@lists.gentoo.org>; Wed,  6 Mar 2024 03:37:39 +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: <1709696182.2f1a06ebbb4459b6ccb2aa96dc4646c2d67fb216.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/sccache/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/sccache/sccache-0.5.4-r1.ebuild dev-util/sccache/sccache-0.5.4.ebuild dev-util/sccache/sccache-9999.ebuild
X-VCS-Directories: dev-util/sccache/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2f1a06ebbb4459b6ccb2aa96dc4646c2d67fb216
X-VCS-Branch: master
Date: Wed,  6 Mar 2024 03:37:39 +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: ab2cbce1-b30a-48b8-8b0f-15139b7dc8b0
X-Archives-Hash: 7bcc7746fa970d7474b9720079f5b85c

commit:     2f1a06ebbb4459b6ccb2aa96dc4646c2d67fb216
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 01:46:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 03:36:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1a06eb

dev-util/sccache: make the zstd dependency effective

It is needed by the zstd-sys crate, but only if we tell it to use the
system copy...

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sccache/{sccache-0.5.4.ebuild => sccache-0.5.4-r1.ebuild} | 3 ++-
 dev-util/sccache/sccache-9999.ebuild                               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-util/sccache/sccache-0.5.4.ebuild b/dev-util/sccache/sccache-0.5.4-r1.ebuild
similarity index 99%
rename from dev-util/sccache/sccache-0.5.4.ebuild
rename to dev-util/sccache/sccache-0.5.4-r1.ebuild
index eb47216271ca..97207cbb5aeb 100644
--- a/dev-util/sccache/sccache-0.5.4.ebuild
+++ b/dev-util/sccache/sccache-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.7
@@ -444,6 +444,7 @@ src_configure() {
 	# Should be able to drop this once we have a 'gentoo' profile
 	sed -i 's/strip = true/strip = false/' Cargo.toml || die
 
+	export ZSTD_SYS_USE_PKG_CONFIG=1
 	myfeatures=(
 		native-zlib
 		$(usev azure)

diff --git a/dev-util/sccache/sccache-9999.ebuild b/dev-util/sccache/sccache-9999.ebuild
index 2a99e5798f56..ebb46ec79d8d 100644
--- a/dev-util/sccache/sccache-9999.ebuild
+++ b/dev-util/sccache/sccache-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.7
@@ -65,6 +65,7 @@ src_configure() {
 	# Should be able to drop this once we have a 'gentoo' profile
 	sed -i 's/strip = true/strip = false/' Cargo.toml || die
 
+	export ZSTD_SYS_USE_PKG_CONFIG=1
 	myfeatures=(
 		native-zlib
 		$(usev azure)