Merge pull request Homebrew#198433 from Homebrew/pkgconf-migrations-u-2

u*: migrate to `pkgconf` (part 2)

Author: BrewTestBot

Formula/u/urdfdom.rb

@@ -23,14 +23,14 @@ class Urdfdom < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "pkg-config" => :test
+  depends_on "pkgconf" => :test
   depends_on "console_bridge"
   depends_on "tinyxml2"
   depends_on "urdfdom_headers"
 
   def install
     ENV.cxx11
-    system "cmake", "-S", ".", "-B", "build", *std_cmake_args, "-DCMAKE_INSTALL_RPATH=#{rpath}"
+    system "cmake", "-S", ".", "-B", "build", "-DCMAKE_INSTALL_RPATH=#{rpath}", *std_cmake_args
     system "cmake", "--build", "build"
     system "cmake", "--install", "build"
   end

Formula/u/urdfdom_headers.rb

@@ -18,7 +18,7 @@ class UrdfdomHeaders < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "pkg-config" => :test
+  depends_on "pkgconf" => :test
 
   def install
     ENV.cxx11

Formula/u/urh.rb

@@ -20,7 +20,7 @@ class Urh < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "c7249ef337f50461015896cc171db6501f3ca2b3d0b9e0664a2c32ba51fb7629"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "hackrf"
   depends_on "numpy"
   depends_on "pyqt@5"

Formula/u/usbredir.rb

@@ -23,7 +23,7 @@ class Usbredir < Formula
 
   depends_on "meson" => :build
   depends_on "ninja" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "glib"
   depends_on "libusb"
 
@@ -40,10 +40,7 @@ def install
         return usbredirparser_create() ? 0 : 1;
       }
     C
-    system ENV.cc, "test.c",
-                   "-L#{lib}",
-                   "-lusbredirparser",
-                   "-o", "test"
+    system ENV.cc, "test.c", "-L#{lib}", "-lusbredirparser", "-o", "test"
     system "./test"
   end
 end

Formula/u/usbutils.rb

@@ -26,7 +26,7 @@ class Usbutils < Formula
 
   depends_on "meson" => :build
   depends_on "ninja" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "libusb"
 
   on_linux do

Formula/u/util-macros.rb

@@ -14,7 +14,7 @@ class UtilMacros < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "418d29093fca0889e64ecc830bd8d987269774aba25d302cf959338acc1363ac"
   end
 
-  depends_on "pkg-config" => :test
+  depends_on "pkgconf" => :test
 
   def install
     args = %W[

Formula/u/utimer.rb

@@ -29,7 +29,7 @@ class Utimer < Formula
 
   depends_on "gettext" => :build
   depends_on "intltool" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "glib"
 
   uses_from_macos "perl" => :build
@@ -43,11 +43,8 @@ class Utimer < Formula
   end
 
   def install
-    if OS.linux?
-      ENV.prepend_path "PERL5LIB", Formula["perl-xml-parser"].libexec/"lib/perl5"
-      # Work around /usr/bin/ld: timer.o:(.bss+0x0): multiple definition of `ut_config'
-      ENV.append_to_cflags "-fcommon"
-    end
+    # Work around /usr/bin/ld: timer.o:(.bss+0x0): multiple definition of `ut_config'
+    ENV.append_to_cflags "-fcommon" if OS.linux?
     # Fix compile with newer Clang. Project is no longer maintained so cannot be fixed upstream.
     ENV.append_to_cflags "-Wno-implicit-function-declaration" if DevelopmentTools.clang_build_version >= 1403
 

Formula/u/uutils-findutils.rb

@@ -17,7 +17,7 @@ class UutilsFindutils < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "1960b1bfa82f3b45f2df7580e15e9114a04503da577ec1cc76a02c3e2191bb7d"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "rust" => :build
   depends_on "oniguruma"
 

Formula/u/uuu.rb

@@ -24,7 +24,7 @@ class Uuu < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
 
   depends_on "libusb"
   depends_on "libzip"

Formula/u/uv.rb

@@ -15,7 +15,7 @@ class Uv < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "c81cdb8fd4db86bc01b3452375f6d5fc7e7d1126fa00ed328ccb50d4f6f6ab6c"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "rust" => :build
 
   uses_from_macos "python" => :test