gentoo auto-resync : 22:01:2024 - 16:48:54

7 files changed, 218 insertions, 145 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index a692399b820d..1dec5eb06846 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,12 +1,10 @@
+AUX pkgconf-2.1.0-digraph-test.patch 1200 BLAKE2B e46ed6e40e853ea879b7c840f0e04f52049026f14f46f11562602a20b3f7c73a8cdf0323768ac9cad279937d95e5fe9c26ee8ca1c8127525948db0141a7d0b72 SHA512 6d1a8464f67782370ccda54b3a07780490853ba53205fc8cc90758bf23eae0b43ef61ac9ef02ddf8667d4a54fa45964992540f02e087b758bcd61d717cf050dd
+AUX pkgconf-2.1.0-fix-modversion.patch 3007 BLAKE2B c81f97e96cde8accb848b8fe56001daa1ad3342731afd9146fcda89ddfc164d4d2df38fc03143d0ac134940663e06d1581c3c4371269496d6bca4c143bd91e4c SHA512 d47da4d58abe5fdd8877b012a205dcab96e7d39624d6e333ce8e72d1af9e3daafc2a9106bc80a04599fb27d8a61a1a176fc2819c680eac482477c4a4fef8e75d
+AUX pkgconf-2.1.0-traverse-only-once.patch 2192 BLAKE2B 801d55d823f2a0d8698c75c84297f586c22f2250b0e9663f8e6f49491507352762cfeed0639320443af7289c336f4bd6b7b295effc0da6603da9d631198b075b SHA512 f50f1f250544a7fa0476dec9f415920a43aa0799c473ea28de931ad121c60a74eab83b0207be4ba706e0e007445dee3ccf11714ef7079c6564a86b9c7f3ed48c
 DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba
-DIST pkgconf-2.0.1.tar.xz 310576 BLAKE2B 9cb4a1a2ba9a961f184e8d600e15866b6ca971c84b1f9ce83a9ce528b16ec1f6c425ca0deebe5aa11f54d4daf64afbd59e96289a2e17a4bf62f8a82d48d59248 SHA512 1f6e6e421e6e6228aad5cbd834016c8657a59e3bbb5929de4b62377a79cb4e4a52e339f305378b80e6309701bbc0490179e0ead7bdee9da6d7c78565d7b80bc8
-DIST pkgconf-2.0.2.tar.xz 310604 BLAKE2B bc13a987d2ed4076af126dfd81c77c10004d0436fcb94c9e7ba18d37a7209ac432f4eb6909e65b22bdff0a4392ef1e764840efa7605adab0db1efa687b131796 SHA512 ca0570cff61534508b091408edf0021773c5f7f4c57ec5427474242f5f84a37e8fdc220cc02b9b362e71b6f8735f0be2c2c246e2212c65a833e44182e2e12e32
-DIST pkgconf-2.0.3.tar.xz 310796 BLAKE2B a0a526d59dce4eaafb5a43784676d7717ea8718ea207b3c47e78ef5388804547633ca76cf5b0942d8409c51ff293b8760ee2f9ebfc3ee6c4e4d41861e93db25a SHA512 cdbacd2894f9e5767dd7407ac4d4301a769ee0c6122a1219ce2c89d1a2019056d150cc42b98fda7fb0bd3d167fda2b897a1a92619f64ec5bb02ac9dbc31e445e
 DIST pkgconf-2.1.0.tar.xz 311576 BLAKE2B 43ac91f15106764f0b03ac4e1c3ff59aaba0436a221a295be93dd1a78b74e0185e60be8d24d040cc4ce0b0fb4446a6a8f493e7cc69bafafe5cefa9beab9b2bd5 SHA512 239dd75814d23f98a64c7df7ab12bc87a0ba52227ef0102086876e39712a2a5d2fdd1e27314070f66f9b38ef5bc0a31f0b90522f34bf8351e7bfb12c75313641
 EBUILD pkgconf-1.8.1.ebuild 1557 BLAKE2B 713707b02b74f5abbee292446c94ee2dff2040b01bae387f541a610aa9332f8bd4b094932f1f4e806c8db3da0ad2e7a8f8f1328fcacf7801de6f6c5d5cb2d331 SHA512 fe9f9aedf8f38686d5d83a9f17355955d1da48e0e3eed4176a37b36f8417b5b0d2c8d84ee2d3e98f9484b3a5a2f82e2d6a87f1aeb4dece86a7ad938fa3e944cc
-EBUILD pkgconf-2.0.1.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
-EBUILD pkgconf-2.0.2.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
-EBUILD pkgconf-2.0.3.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b
+EBUILD pkgconf-2.1.0-r1.ebuild 1678 BLAKE2B 2ad2f33ef24443f9be4279951130b30d720a773241ba19756fc7e584a45f306b38f2767ed1c0cb003ebdaa17c6a838504f349d142173023b88730e6fd2bd9a23 SHA512 ff1020f223eae2d6ca04a610b313492c76019e74898b00fb894f68eacda6c33a45f3cf6655dd21edb105046ba5d5b10834ad24db0b760d0286a954895b063a12
 EBUILD pkgconf-2.1.0.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b
 EBUILD pkgconf-9999.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b
 MISC metadata.xml 434 BLAKE2B 5a9cf47c90626564f39e00f9a06d5085ae9dcd4e0a99a074ba0cc053919c9223d44576bc4e534b76fe6172cf40c9a2f8ca3b9a4e111cf99e91d6828495d10b25 SHA512 eab817a711dcccf9dae4dacd9b8c68b58537d4219803c9cf89c3dc8a0625020f3af95a6fd2d1e80a588726b36ddd71bcc4d920556746146ee132ba0875030747
diff --git a/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch b/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch
new file mode 100644
index 000000000000..90232ab4c15b
--- /dev/null
+++ b/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch
@@ -0,0 +1,41 @@
+https://github.com/pkgconf/pkgconf/pull/340
+
+From db387172ac5fe2a3118945bf45bd90d8a2efeaf4 Mon Sep 17 00:00:00 2001
+From: Kai Pastor <dg0yt@darc.de>
+Date: Wed, 17 Jan 2024 18:28:38 +0100
+Subject: [PATCH] Test digraph completeness for private-libs-duplication
+
+Complements 45073b7.
+--- a/tests/requires.sh
++++ b/tests/requires.sh
+@@ -10,6 +10,7 @@ tests_init \
+ 	argv_parse2 \
+ 	static_cflags \
+ 	private_duplication \
++	private_duplication_digraph \
+ 	libs_static2 \
+ 	missing \
+ 	requires_internal \
+@@ -73,6 +74,21 @@ private_duplication_body()
+ 		pkgconf --static --libs-only-l private-libs-duplication
+ }
+ 
++private_duplication_digraph_body()
++{
++	export PKG_CONFIG_PATH="${selfdir}/lib1"
++	atf_check \
++		-o 'match:"virtual:world" -> "private-libs-duplication"' \
++		-o 'match:"virtual:world" -> "bar"' \
++		-o 'match:"virtual:world" -> "baz"' \
++		-o 'match:"virtual:world" -> "foo"' \
++		-o 'match:"private-libs-duplication" -> "bar"' \
++		-o 'match:"private-libs-duplication" -> "baz"' \
++		-o 'match:"bar" -> "foo"' \
++		-o 'match:"baz" -> "foo"' \
++		pkgconf --static --libs-only-l private-libs-duplication --digraph
++}
++
+ libs_static2_body()
+ {
+ 	export PKG_CONFIG_PATH="${selfdir}/lib1"
+
diff --git a/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch b/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch
new file mode 100644
index 000000000000..3336a455794f
--- /dev/null
+++ b/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch
@@ -0,0 +1,95 @@
+https://github.com/pkgconf/pkgconf/issues/335
+https://github.com/pkgconf/pkgconf/issues/332
+https://github.com/pkgconf/pkgconf/issues/317
+https://github.com/pkgconf/pkgconf/pull/336
+
+https://github.com/pkgconf/pkgconf/commit/125af82dbe93eddadb7ec10eebac5087e9fbc451
+https://github.com/pkgconf/pkgconf/commit/b2f8386c32d1cb4dfa8f51c619c0c2a56a3544d6
+https://github.com/pkgconf/pkgconf/commit/5825e2c6d608ef74a97349e81d750ab95c53cf50
+
+From 9a5c9be4ccef66a80df7533e00e525f87ff2fb01 Mon Sep 17 00:00:00 2001
+From: Kai Pastor <dg0yt@darc.de>
+Date: Fri, 1 Dec 2023 21:20:39 +0100
+Subject: [PATCH 1/3] Test --modversion with constraint
+
+--- a/tests/regress.sh
++++ b/tests/regress.sh
+@@ -27,6 +27,9 @@ tests_init \
+ 	modversion_fullpath \
+ 	modversion_provides \
+ 	modversion_uninstalled \
++	modversion_one_word_expression \
++	modversion_two_word_expression \
++	modversion_three_word_expression \
+ 	pcpath \
+ 	virtual_variable \
+ 	fragment_collision \
+@@ -301,3 +304,21 @@ modversion_uninstalled_body()
+ 	atf_check -o inline:"1.2.3\n" \
+ 		pkgconf --with-path="${selfdir}/lib1" --modversion omg
+ }
++
++modversion_one_word_expression_body()
++{
++	atf_check -o inline:"1.2.3\n" \
++		pkgconf --with-path="${selfdir}/lib1" --modversion "foo > 1.0"
++}
++
++modversion_two_word_expression_body()
++{
++	atf_check -o inline:"1.2.3\n" \
++		pkgconf --with-path="${selfdir}/lib1" --modversion foo "> 1.0"
++}
++
++modversion_three_word_expression_body()
++{
++	atf_check -o inline:"1.2.3\n" \
++		pkgconf --with-path="${selfdir}/lib1" --modversion foo ">" 1.0
++}
+
+From 0d4e6fa01074f5e540a7d89731edf44751bd17fc Mon Sep 17 00:00:00 2001
+From: Kai Pastor <dg0yt@darc.de>
+Date: Fri, 1 Dec 2023 21:50:46 +0100
+Subject: [PATCH 2/3] Fix --modversion output
+
+--- a/cli/main.c
++++ b/cli/main.c
+@@ -333,7 +333,12 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int
+ 			pkgconf_dependency_t *dep = world_iter->data;
+ 			pkgconf_pkg_t *pkg = dep->match;
+ 
+-			if (strcmp(pkg->why, queue_node->package))
++			const size_t name_len = strlen(pkg->why);
++			if (name_len > strlen(queue_node->package) ||
++			    strncmp(pkg->why, queue_node->package, name_len) ||
++			    (queue_node->package[name_len] != 0 &&
++			     !isspace(queue_node->package[name_len]) &&
++			     !PKGCONF_IS_OPERATOR_CHAR(queue_node->package[name_len])))
+ 				continue;
+ 
+ 			if (pkg->version != NULL) {
+
+From ace73a690437488baea28130c98f0b1eaab4689e Mon Sep 17 00:00:00 2001
+From: Kai Pastor <dg0yt@darc.de>
+Date: Fri, 1 Dec 2023 22:12:20 +0100
+Subject: [PATCH 3/3] Fix crash on two-word expressions
+
+--- a/cli/main.c
++++ b/cli/main.c
+@@ -1405,6 +1405,15 @@ main(int argc, char *argv[])
+ 			pkgconf_queue_push(&pkgq, package);
+ 			pkg_optind++;
+ 		}
++		else if (argv[pkg_optind + 2] == NULL)
++		{
++			char packagebuf[PKGCONF_BUFSIZE];
++
++			snprintf(packagebuf, sizeof packagebuf, "%s %s", package, argv[pkg_optind + 1]);
++			pkg_optind += 2;
++
++			pkgconf_queue_push(&pkgq, packagebuf);
++		}
+ 		else
+ 		{
+ 			char packagebuf[PKGCONF_BUFSIZE];
+
diff --git a/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch b/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch
new file mode 100644
index 000000000000..80eab2485e1e
--- /dev/null
+++ b/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch
@@ -0,0 +1,71 @@
+https://issuetracker.google.com/issues/317357322
+https://bugs.gentoo.org/912843
+https://github.com/pkgconf/pkgconf/pull/339
+
+From 478199b425b46e9dae36bb174f1bd08bf3ffb0f1 Mon Sep 17 00:00:00 2001
+From: Yi Chou <yich@google.com>
+Date: Fri, 22 Dec 2023 00:13:31 +0800
+Subject: [PATCH] Use traverse_id to prevent traverse pkgdep twice
+
+--- a/libpkgconf/libpkgconf.h
++++ b/libpkgconf/libpkgconf.h
+@@ -137,6 +137,8 @@ struct pkgconf_path_ {
+ #define PKGCONF_PKG_PROPF_CACHED		0x02
+ #define PKGCONF_PKG_PROPF_UNINSTALLED		0x08
+ #define PKGCONF_PKG_PROPF_VIRTUAL		0x10
++#define PKGCONF_PKG_PROPF_VISITED		0x20
++#define PKGCONF_PKG_PROPF_VISITED_PRIVATE	0x40
+ 
+ struct pkgconf_pkg_ {
+ 	int refcount;
+@@ -176,6 +178,7 @@ struct pkgconf_pkg_ {
+ 
+ 	uint64_t serial;
+ 	uint64_t identifier;
++	uint64_t traverse_id;
+ };
+ 
+ typedef bool (*pkgconf_pkg_iteration_func_t)(const pkgconf_pkg_t *pkg, void *data);
+@@ -212,6 +215,7 @@ struct pkgconf_client_ {
+ 
+ 	uint64_t serial;
+ 	uint64_t identifier;
++	uint64_t traverse_id;
+ 
+ 	pkgconf_pkg_t **cache_table;
+ 	size_t cache_count;
+--- a/libpkgconf/pkg.c
++++ b/libpkgconf/pkg.c
+@@ -1628,6 +1628,21 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client,
+ 	if (maxdepth == 0)
+ 		return eflags;
+ 
++	unsigned int visited_flag = (client->flags & PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE) ? PKGCONF_PKG_PROPF_VISITED_PRIVATE : PKGCONF_PKG_PROPF_VISITED;
++
++	if (root->traverse_id == client->traverse_id)
++	{
++		if (root->flags & visited_flag)
++			return eflags;
++	}
++	else
++	{
++		root->traverse_id = client->traverse_id;
++		root->flags &= ~(PKGCONF_PKG_PROPF_VISITED | PKGCONF_PKG_PROPF_VISITED_PRIVATE);
++	}
++
++	root->flags |= visited_flag;
++
+ 	PKGCONF_TRACE(client, "%s: level %d, serial %"PRIu64, root->id, maxdepth, client->serial);
+ 
+ 	if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL)
+@@ -1672,6 +1687,9 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
+ 	int maxdepth,
+ 	unsigned int skip_flags)
+ {
++	static uint64_t traverse_id = 0;
++	client->traverse_id = ++traverse_id;
++
+ 	if (root->flags & PKGCONF_PKG_PROPF_VIRTUAL)
+ 		client->serial++;
+ 
+
diff --git a/dev-util/pkgconf/pkgconf-2.0.1.ebuild b/dev-util/pkgconf/pkgconf-2.0.1.ebuild
deleted file mode 100644
index 742423bfd5ac..000000000000
--- a/dev-util/pkgconf/pkgconf-2.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2012-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
-else
-	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
-HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
-
-LICENSE="ISC"
-SLOT="0/4"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="!dev-util/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/pkgconf
-		/usr/bin/pkg-config$(get_exeext)
-	)
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-system-includedir="${EPREFIX}/usr/include"
-		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-2.0.2.ebuild b/dev-util/pkgconf/pkgconf-2.0.2.ebuild
deleted file mode 100644
index 742423bfd5ac..000000000000
--- a/dev-util/pkgconf/pkgconf-2.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2012-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
-else
-	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
-HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
-
-LICENSE="ISC"
-SLOT="0/4"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="!dev-util/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/pkgconf
-		/usr/bin/pkg-config$(get_exeext)
-	)
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-system-includedir="${EPREFIX}/usr/include"
-		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-2.0.3.ebuild b/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild
index 1a3b9b6870e5..7ad7f087b464 100644
--- a/dev-util/pkgconf/pkgconf-2.0.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2023 Gentoo Authors
+# Copyright 2012-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,12 @@ BDEPEND="
 "
 RDEPEND="!dev-util/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-modversion.patch
+	"${FILESDIR}"/${PN}-2.1.0-digraph-test.patch
+	"${FILESDIR}"/${PN}-2.1.0-traverse-only-once.patch
+)
+
 src_prepare() {
 	default