From 3f28d89e9a8a94fa1f880a9f5454fec5d978a0bf Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 4 Mar 2024 07:57:52 +0000
Subject: [PATCH] dev-util/pkgconf: Sync with Gentoo

It's from Gentoo commit 1f9d961bfe241cc1e14725c997f0e4853e0d43e0.
---
 .../portage-stable/dev-util/pkgconf/metadata.xml           | 7 +++++++
 .../portage-stable/dev-util/pkgconf/pkgconf-2.1.1.ebuild   | 6 +++++-
 .../portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild    | 6 +++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml
index 56ed879da0..0228976b1b 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml
@@ -11,4 +11,11 @@
 		<remote-id type="github">pkgconf/pkgconf</remote-id>
 		<remote-id type="cpe">cpe:/a:pkgconf:pkgconf</remote-id>
 	</upstream>
+	<use>
+		<flag name="native-symlinks">
+			Install generic symlinks like pkgconf and pkg-config.
+			If this flag is disabled, only CHOST-prefixed pkg-config
+			executables will be available to end users and ebuilds.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.1.ebuild
index 8651a601e5..435eb9ff31 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/4"
-IUSE="test"
+IUSE="+native-symlinks test"
 
 RESTRICT="!test? ( test )"
 
@@ -65,5 +65,9 @@ multilib_src_install() {
 multilib_src_install_all() {
 	einstalldocs
 
+	if ! use native-symlinks; then
+		rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die
+	fi
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild
index c4ee052f6b..51dd19d7b1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/4"
-IUSE="test"
+IUSE="+native-symlinks test"
 
 RESTRICT="!test? ( test )"
 
@@ -65,5 +65,9 @@ multilib_src_install() {
 multilib_src_install_all() {
 	einstalldocs
 
+	if ! use native-symlinks; then
+		rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die
+	fi
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }