Merge pull request Homebrew#198849 from Homebrew/pkgconf-migrations-s-6

s*: migrate to `pkgconf` (part 6)

Formula/s/squashfuse.rb

@@ -12,13 +12,14 @@ class Squashfuse < Formula
   depends_on "autoconf" => :build
   depends_on "automake" => :build
   depends_on "libtool" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "libfuse"
   depends_on :linux # on macOS, requires closed-source macFUSE
   depends_on "lz4"
   depends_on "lzo"
   depends_on "squashfs"
   depends_on "xz"
+  depends_on "zlib"
   depends_on "zstd"
 
   def install

Formula/s/sratom.rb

@@ -23,7 +23,7 @@ class Sratom < Formula
 
   depends_on "meson" => :build
   depends_on "ninja" => :build
-  depends_on "pkg-config" => [:build, :test]
+  depends_on "pkgconf" => [:build, :test]
   depends_on "lv2"
   depends_on "serd"
   depends_on "sord"

Formula/s/srt.rb

@@ -16,7 +16,7 @@ class Srt < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "openssl@3"
 
   def install

Formula/s/srtp.rb

@@ -22,11 +22,11 @@ class Srtp < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "eae0dbd9de36ab4ca28ded9160425af7fa9ab1928b5de1d94049866627b514b1"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "openssl@3"
 
   def install
-    system "./configure", "--disable-debug", "--prefix=#{prefix}", "--enable-openssl"
+    system "./configure", "--enable-openssl", *std_configure_args
     system "make", "test"
     system "make", "shared_library"
     system "make", "install" # Can't go in parallel of building the dylib

Formula/s/ssh-vault.rb

@@ -18,7 +18,7 @@ class SshVault < Formula
   depends_on "rust" => :build
 
   on_linux do
-    depends_on "pkg-config" => :build
+    depends_on "pkgconf" => :build
     depends_on "openssl@3"
   end
 

Formula/s/sshfs.rb

@@ -12,7 +12,7 @@ class Sshfs < Formula
 
   depends_on "meson" => :build
   depends_on "ninja" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "glib"
   depends_on "libfuse"
   depends_on :linux # on macOS, requires closed-source macFUSE

Formula/s/ssocr.rb

@@ -17,7 +17,7 @@ class Ssocr < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "7c612e5d1a5b67047699009bd3193889a7bdcdefb7c0b5541b642a4cde7aa49d"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "imlib2"
 
   resource "homebrew-test-image" do

Formula/s/sstp-client.rb

@@ -18,16 +18,15 @@ class SstpClient < Formula
     sha256 x86_64_linux:   "30078ed4805a4e3b52753c60ad87590d21a8a5289b31fde3d27be0116f179b2b"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "libevent"
   depends_on "openssl@3"
 
   def install
-    system "./configure", "--disable-dependency-tracking",
-                          "--disable-silent-rules",
+    system "./configure", "--disable-silent-rules",
                           "--disable-ppp-plugin",
-                          "--prefix=#{prefix}",
-                          "--with-runtime-dir=#{var}/run/sstpc"
+                          "--with-runtime-dir=#{var}/run/sstpc",
+                          *std_configure_args
     system "make", "install"
 
     # Create a directory needed by sstpc for privilege separation

Formula/s/starship.rb

@@ -21,7 +21,7 @@ class Starship < Formula
   uses_from_macos "zlib"
 
   on_linux do
-    depends_on "pkg-config" => :build
+    depends_on "pkgconf" => :build
     depends_on "dbus"
   end
 

Formula/s/startup-notification.rb

@@ -22,18 +22,17 @@ class StartupNotification < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "45873a4a273a11b66436459b7130de94bcb32470a3a4376ef74b2803e2494462"
   end
 
-  depends_on "pkg-config" => [:build, :test]
+  depends_on "pkgconf" => [:build, :test]
   depends_on "libx11"
   depends_on "libxcb"
   depends_on "xcb-util"
 
   def install
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
+    system "./configure", *std_configure_args
     system "make", "install"
   end
 
   test do
-    assert_match "-I#{include}", shell_output("pkg-config --cflags libstartup-notification-1.0").chomp
+    assert_match "-I#{include}", shell_output("pkgconf --cflags libstartup-notification-1.0").chomp
   end
 end

Formula/s/stella.rb

@@ -17,16 +17,14 @@ class Stella < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "7689d9dae573a6288fe3be94adabad8791c2075d210faa27c82e624c4c6c6689"
   end
 
-  depends_on "pkg-config" => :build
-  depends_on xcode: :build
+  depends_on "pkgconf" => :build
+  depends_on xcode: :build # for xcodebuild
   depends_on "libpng"
   depends_on "sdl2"
 
   uses_from_macos "sqlite"
   uses_from_macos "zlib"
 
-  fails_with gcc: "5"
-
   def install
     sdl2 = Formula["sdl2"]
     libpng = Formula["libpng"]

Formula/s/stellar-cli.rb

@@ -15,7 +15,7 @@ class StellarCli < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "bd594e5e89b8c29f2bcb1f486a16beb62c410878f76fd820f0825a9ffab02059"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "rust" => :build
   depends_on "openssl@3"
 

Formula/s/stgit.rb

@@ -18,7 +18,7 @@ class Stgit < Formula
   end
 
   depends_on "asciidoc" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "rust" => :build
   depends_on "xmlto" => :build
   depends_on "git"

Formula/s/stlink.rb

@@ -18,7 +18,7 @@ class Stlink < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "libusb"
 
   # upstream PR ref, https://github.com/stlink-org/stlink/pull/1373
@@ -32,19 +32,17 @@ class Stlink < Formula
   end
 
   def install
-    args = []
-
     libusb = Formula["libusb"]
-    args << "-DLIBUSB_INCLUDE_DIR=#{libusb.opt_include}/libusb-#{libusb.version.major_minor}"
-    args << "-DLIBUSB_LIBRARY=#{libusb.opt_lib/shared_library("libusb-#{libusb.version.major_minor}")}"
-
+    args = %W[
+      -DCMAKE_INSTALL_RPATH=#{rpath}
+      -DLIBUSB_INCLUDE_DIR=#{libusb.opt_include}/libusb-#{libusb.version.major_minor}
+      -DLIBUSB_LIBRARY=#{libusb.opt_lib/shared_library("libusb-#{libusb.version.major_minor}")}
+    ]
     if OS.linux?
       args << "-DSTLINK_MODPROBED_DIR=#{lib}/modprobe.d"
       args << "-DSTLINK_UDEV_RULES_DIR=#{lib}/udev/rules.d"
     end
 
-    args << "-DCMAKE_INSTALL_RPATH=#{rpath}"
-
     system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
     system "cmake", "--build", "build"
     system "cmake", "--install", "build"

Formula/s/stoken.rb

@@ -21,16 +21,15 @@ class Stoken < Formula
   depends_on "autoconf" => :build
   depends_on "automake" => :build
   depends_on "libtool" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "gmp"
   depends_on "nettle"
 
   uses_from_macos "libxml2"
 
   def install
     system "./autogen.sh"
-    system "./configure", *std_configure_args,
-                          "--disable-silent-rules"
+    system "./configure", "--disable-silent-rules", *std_configure_args
     system "make", "check"
     system "make", "install"
   end

Formula/s/streamlink.rb

@@ -25,7 +25,7 @@ class Streamlink < Formula
   uses_from_macos "libxslt"
 
   on_linux do
-    depends_on "pkg-config" => :build
+    depends_on "pkgconf" => :build
   end
 
   resource "attrs" do

Formula/s/streamripper.rb

@@ -25,7 +25,7 @@ class Streamripper < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "ebe33322f4bca7c998f76446b9c10988c7c058ba02bf0aedbbec87b0a9861a38"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "glib"
   depends_on "mad"
 

Formula/s/strongswan.rb

@@ -28,7 +28,7 @@ class Strongswan < Formula
     depends_on "bison" => :build
     depends_on "gettext" => :build
     depends_on "libtool" => :build
-    depends_on "pkg-config" => :build
+    depends_on "pkgconf" => :build
   end
 
   depends_on "openssl@3"