From 1ee09d87c1c86e965b5397028b50087cd86f53df Mon Sep 17 00:00:00 2001
From: Tim Kok <tim.kok@surf.nl>
Date: Wed, 14 Feb 2024 15:05:09 +0100
Subject: [PATCH] Switch pkgconf for pkg-config

---
 .../a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb |  2 +-
 .../pkg-config-0.29.2-GCCcore-13.2.0.eb       | 35 -------------------
 .../w/wget/wget-1.21.4-GCCcore-13.2.0.eb      |  4 +--
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.2-GCCcore-13.2.0.eb

diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb
index 0151ba327e0..eadec17227f 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb
@@ -18,7 +18,7 @@ checksums = ['24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0']
 
 builddependencies = [
     ('Autotools', '20220317'),
-    ('pkg-config', '0.29.2'),
+    ('pkgconf', '2.0.3'),
 ]
 dependencies = [
     ('Eigen', '3.4.0'),
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.2-GCCcore-13.2.0.eb
deleted file mode 100644
index b9bda34701d..00000000000
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.2-GCCcore-13.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'pkg-config'
-version = '0.29.2'
-
-homepage = 'https://www.freedesktop.org/wiki/Software/pkg-config/'
-description = """
- pkg-config is a helper tool used when compiling applications and libraries.
- It helps you insert the correct compiler options on the command line so an
- application can use gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
- for instance, rather than hard-coding values on where to find glib (or other
- libraries).
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
-
-source_urls = ['https://%(name)s.freedesktop.org/releases/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591']
-
-builddependencies = [
-    ('binutils', '2.40'),
-]
-
-configopts = " --with-internal-glib"
-
-# don't use PAX, it might break.
-tar_config_opts = True
-
-sanity_check_paths = {
-    'files': ['bin/%(name)s'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/w/wget/wget-1.21.4-GCCcore-13.2.0.eb b/easybuild/easyconfigs/w/wget/wget-1.21.4-GCCcore-13.2.0.eb
index 5219243fcbc..d77cd2923d7 100644
--- a/easybuild/easyconfigs/w/wget/wget-1.21.4-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/w/wget/wget-1.21.4-GCCcore-13.2.0.eb
@@ -18,7 +18,7 @@ checksums = [
 
 builddependencies = [
     ('binutils', '2.40'),
-    ('pkg-config', '0.29.2'),
+    ('pkgconf', '2.0.3'),
     ('Perl', '5.38.0'),
 ]
 dependencies = [
@@ -31,7 +31,7 @@ dependencies = [
     # ('GnuTLS', '3.7.1'),
 ]
 
-# make sure pkg-config picks up system packages (OpenSSL & co)
+# make sure pkgconfig picks up system packages (OpenSSL & co)
 local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
 local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
 local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"