Run Rubocop on tree, again (#8704)

.rubocop.yml

@@ -122,6 +122,9 @@ Layout/HashAlignment:
 Layout/CommentIndentation:
   Enabled: false
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
 Layout/FirstHashElementIndentation:
   Enabled: false
 # EnforcedStyle: consistent
@@ -129,6 +132,9 @@ Layout/FirstHashElementIndentation:
 Layout/IndentationStyle:
   EnforcedStyle: spaces
 
+Layout/LeadingCommentSpace:
+  Enabled: false
+
 Layout/SpaceInsideBlockBraces:
   Enabled: false
 
@@ -180,6 +186,9 @@ Style/RedundantCapitalW:
 Style/RedundantLineContinuation:
   Enabled: false
 
+Style/RedundantStringEscape:
+  Enabled: false
+
 Naming/AccessorMethodName:
   Enabled: false
 

lib/package.rb

@@ -225,7 +225,7 @@ class Package
   end
 
   def self.get_binary_sha256(architecture)
-    return @binary_sha256 && @binary_sha256.key?(architecture) ? @binary_sha256[architecture] : ''
+    return @binary_sha256&.key?(architecture) ? @binary_sha256[architecture] : ''
   end
 
   def self.get_extract_dir

packages/clamav.rb

@@ -13,13 +13,13 @@ class Clamav < Package
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/clamav/1.1.1_armv7l/clamav-1.1.1-chromeos-armv7l.tar.zst',
      armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/clamav/1.1.1_armv7l/clamav-1.1.1-chromeos-armv7l.tar.zst',
        i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/clamav/1.1.1_i686/clamav-1.1.1-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/clamav/1.1.1_x86_64/clamav-1.1.1-chromeos-x86_64.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/clamav/1.1.1_x86_64/clamav-1.1.1-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
     aarch64: '99ec7eed070ac95692e6dd79b3db5e5e5d81bb2d2895847e0a4e3a574d11c00f',
      armv7l: '99ec7eed070ac95692e6dd79b3db5e5e5d81bb2d2895847e0a4e3a574d11c00f',
        i686: 'a8a01408181b94d88bc3f9eb404b7b8373db229251048af6d52e1c001f22a5b2',
-     x86_64: '55a9893ae7c4fd3416c3a119c0928d0ac88bf245cdf1bf1bb1c1657b3aa1c5b0',
+     x86_64: '55a9893ae7c4fd3416c3a119c0928d0ac88bf245cdf1bf1bb1c1657b3aa1c5b0'
   })
 
   depends_on 'rust' => :build

packages/devil.rb

@@ -41,7 +41,7 @@ class Devil < Package
   def self.patch
     system "find -type f -exec sed -i 's,DESTINATION lib,DESTINATION lib#{CREW_LIB_SUFFIX},g' {} +"
     # As per https://github.com/DentonW/DevIL/pull/102
-    @jasper_patch = <<~'JASPER_PATCH'
+    @jasper_patch = <<~JASPER_PATCH
       diff -NPaur a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt
       --- a/DevIL/CMakeLists.txt	2022-10-04 19:42:15.952513098 -0400
       +++ b/DevIL/CMakeLists.txt	2022-10-04 19:51:20.745032984 -0400

packages/docbook_xml412.rb

@@ -37,7 +37,7 @@ class Docbook_xml412 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -45,7 +45,7 @@ class Docbook_xml412 < Package
       system "LD_LIBRARY_PATH=#{CREW_LIB_PREFIX} xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog || true"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xml42.rb

@@ -37,7 +37,7 @@ class Docbook_xml42 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -45,7 +45,7 @@ class Docbook_xml42 < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xml43.rb

@@ -37,7 +37,7 @@ class Docbook_xml43 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -45,7 +45,7 @@ class Docbook_xml43 < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xml44.rb

@@ -37,7 +37,7 @@ class Docbook_xml44 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -45,7 +45,7 @@ class Docbook_xml44 < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xml45.rb

@@ -37,7 +37,7 @@ class Docbook_xml45 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -45,7 +45,7 @@ class Docbook_xml45 < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xml50.rb

@@ -233,7 +233,7 @@ class Docbook_xml50 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -241,7 +241,7 @@ class Docbook_xml50 < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xml51.rb

@@ -118,7 +118,7 @@ class Docbook_xml51 < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -126,7 +126,7 @@ class Docbook_xml51 < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xsl.rb

@@ -74,7 +74,7 @@ class Docbook_xsl < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -82,7 +82,7 @@ class Docbook_xsl < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/docbook_xsl_nons.rb

@@ -62,7 +62,7 @@ class Docbook_xsl_nons < Package
     # Docbook common preinstall block
     FileUtils.mkdir_p "#{CREW_PREFIX}/etc/xml"
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.zero?("#{CREW_PREFIX}/etc/xml/catalog")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/catalog") && !File.empty?("#{CREW_PREFIX}/etc/xml/catalog")
       puts "#{CREW_PREFIX}/etc/xml/catalog exists" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/catalog" if @opt_verbose
@@ -70,7 +70,7 @@ class Docbook_xsl_nons < Package
       system "xmlcatalog --noout --create #{CREW_PREFIX}/etc/xml/catalog"
     end
 
-    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.zero?("#{CREW_PREFIX}/etc/xml/docbook-xml")
+    if File.exist?("#{CREW_PREFIX}/etc/xml/docbook-xml") && !File.empty?("#{CREW_PREFIX}/etc/xml/docbook-xml")
       puts "#{CREW_PREFIX}/etc/xml/docbook-xml not empty" if @opt_verbose
     else
       puts "Creating #{CREW_PREFIX}/etc/xml/docbook-xml" if @opt_verbose

packages/gpm.rb

@@ -41,7 +41,7 @@ class Gpm < Package
     FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/profile.d"
     FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/profile.d"
     # via https://github.com/archlinux/svntogit-packages/tree/master/gpm/trunk
-    @gpm_path = <<~'GPM_PATH_EOF'
+    @gpm_path = <<~GPM_PATH_EOF
       [Unit]
       Description=Virtual console mouse server
 

packages/handbrake.rb

@@ -103,7 +103,7 @@ class Handbrake < Package
       system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
     end
     FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/env.d"
-    File.write "#{CREW_DEST_PREFIX}/etc/env.d/10-handbrake", <<~'HANDBRAKE_ENVD_EOF'
+    File.write "#{CREW_DEST_PREFIX}/etc/env.d/10-handbrake", <<~HANDBRAKE_ENVD_EOF
       alias ghb="GDK_BACKEND=wayland ghb"
     HANDBRAKE_ENVD_EOF
   end

packages/hashpipe.rb

@@ -23,7 +23,7 @@ class Hashpipe < Package
   })
 
   def self.patch
-    @hashpipe_patch = <<~'HASHPIPE_PATCHEOF'
+    @hashpipe_patch = <<~HASHPIPE_PATCHEOF
       diff -Npaur orig/hashpipe.c new/hashpipe.c
       --- orig/hashpipe.c	2021-04-08 14:56:27.657272292 -0400
       +++ new/hashpipe.c	2021-04-08 15:11:20.398253126 -0400

packages/js102.rb

@@ -53,7 +53,7 @@ class Js102 < Package
     return unless ARCH == 'i686'
 
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459#c25
-    @math_x86_patch = <<~'PATCH_EOF'
+    @math_x86_patch = <<~PATCH_EOF
       diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
       index 51d79f9c2ec59..fafd7d6fc1e0d 100644
       --- a/modules/fdlibm/src/math_private.h

packages/libproxy.rb

@@ -30,7 +30,7 @@ class Libproxy < Package
   def self.patch
     # As per suggestion for fixing Ninja at
     # https://github.com/libproxy/libproxy/issues/171#issuecomment-1082704815
-    @ninjapatch = <<~'NINJAPATCHEOF'
+    @ninjapatch = <<~NINJAPATCHEOF
       diff --git a/bindings/perl/t/CMakeLists.txt b/bindings/perl/t/CMakeLists.txt
       index 8007124..fdbe81c 100644
       --- a/bindings/perl/t/CMakeLists.txt

packages/mc.rb

@@ -13,13 +13,13 @@ class Mc < Autotools
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mc/4.8.30_armv7l/mc-4.8.30-chromeos-armv7l.tar.zst',
      armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mc/4.8.30_armv7l/mc-4.8.30-chromeos-armv7l.tar.zst',
        i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mc/4.8.30_i686/mc-4.8.30-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mc/4.8.30_x86_64/mc-4.8.30-chromeos-x86_64.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mc/4.8.30_x86_64/mc-4.8.30-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
     aarch64: 'a3f46f94869391c4f9ce09490972e9a7fdfd7d67f6b6b15fa2bcf667b2dc765c',
      armv7l: 'a3f46f94869391c4f9ce09490972e9a7fdfd7d67f6b6b15fa2bcf667b2dc765c',
        i686: '509e05a162b01b54565c810759d3fc6e7c1a220cb959bdd1ccf4aa589daf383c',
-     x86_64: 'eab6581c138140a5a3802682e6dcde24d8f44d4bf0b6914072b6d2fec7661580',
+     x86_64: 'eab6581c138140a5a3802682e6dcde24d8f44d4bf0b6914072b6d2fec7661580'
   })
 
   depends_on 'glib' => :build

packages/musl_native_toolchain.rb

@@ -50,7 +50,7 @@ class Musl_native_toolchain < Package
     # Patch via discussion on musl mailing list with Rich Felker
     # working out issues on i686 Chromebooks for musl.
     # https://www.openwall.com/lists/musl/2022/02/18/1
-    @i686_broken_kernel_patch = <<~'BROKEN_KERNEL_PATCH_EOF'
+    @i686_broken_kernel_patch = <<~BROKEN_KERNEL_PATCH_EOF
       --- a/arch/i386/syscall_arch.h	2022-02-17 16:45:37.398583011 -0500
       +++ b/arch/i386/syscall_arch.h	2022-02-17 16:50:02.311265598 -0500
       @@ -9,11 +9,21 @@

packages/openconnect.rb

@@ -60,7 +60,7 @@ class Openconnect < Package
       fi
     VPNC_STARTEOF
     File.write "#{CREW_DEST_PREFIX}/bin/vpnc-start", @vpnc_start, perm: 0o755
-    @vpnc_stop = <<~'VPNC_STOPEOF'
+    @vpnc_stop = <<~VPNC_STOPEOF
       #!/bin/bash
       killall openconnect
       sudo ip tuntap del mode tun tun0

packages/pavucontrol.rb

@@ -3,7 +3,7 @@ require 'package'
 class Pavucontrol < Package
   description 'PulseAudio Volume Control'
   homepage 'https://freedesktop.org/software/pulseaudio/pavucontrol/'
-  version "4.0-381b-1"
+  version '4.0-381b-1'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://github.com/pulseaudio/pavucontrol/archive/381b708202e87e40347a57f8a627014199cde266.zip'

packages/perl.rb

@@ -53,7 +53,6 @@ class Perl < Package
   end
 
   def self.install
-
     system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
     # Make libperl symlinks into standard locations
     libperl_so = "#{CREW_LIB_PREFIX}/perl5/#{version.split('-')[0]}/core_perl/CORE/libperl.so"

packages/pipewire.rb

@@ -4,12 +4,12 @@ class Pipewire < Package
   description 'PipeWire is a project that aims to greatly improve handling of audio and video under Linux.'
   homepage 'https://pipewire.org'
   version = if Gem::Version.new(CREW_KERNEL_VERSION.to_s) < Gem::Version.new('3.9')
-            '0.3.29'
+              '0.3.29'
-          elsif Gem::Version.new(CREW_KERNEL_VERSION.to_s) <= Gem::Version.new('5.4')
+            elsif Gem::Version.new(CREW_KERNEL_VERSION.to_s) <= Gem::Version.new('5.4')
-            '0.3.60'
+              '0.3.60'
-          else
+            else
-            '0.3.80'
+              '0.3.80'
-          end
+            end
   compatibility 'all'
   license 'LGPL-2.1+'
   source_url 'https://gitlab.freedesktop.org/pipewire/pipewire.git'

packages/polkit.rb

@@ -30,7 +30,7 @@ class Polkit < Package
   def self.patch
     # Fix meson 0.60+ compatibility
     # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99
-    @polkit_meson_patch = <<~'POLKIT_MESON_PATCH_HEREDOC'
+    @polkit_meson_patch = <<~POLKIT_MESON_PATCH_HEREDOC
       diff --git a/actions/meson.build b/actions/meson.build
       index 2abaaf3..1e3f370 100644
       --- a/actions/meson.build

packages/poppler.rb

@@ -40,7 +40,6 @@ class Poppler < Package
   depends_on 'qtbase' # R
   depends_on 'zlibpkg' # R
 
-
   def self.build
     system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
         -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \

packages/repo.rb

@@ -1,5 +1,5 @@
 require 'package'
- 
+
 class Repo < Package
   description 'The Multiple Git Repository Tool'
   homepage 'https://gerrit.googlesource.com/git-repo/'
@@ -10,7 +10,7 @@ class Repo < Package
   git_hashtag "v#{version}"
 
   depends_on 'python3'
- 
+
   no_compile_needed
 
   def self.preflight

packages/shhmsg.rb

@@ -23,7 +23,7 @@ class Shhmsg < Package
   })
 
   def self.patch
-    `sed -i 's/.*SHARED.*0.*/SHARED=1/' Makefile`   # enable shared
+    `sed -i 's/.*SHARED.*0.*/SHARED=1/' Makefile` # enable shared
   end
 
   def self.build

packages/shhopt.rb

@@ -23,7 +23,7 @@ class Shhopt < Package
   })
 
   def self.patch
-    `sed -i 's/.*#SHARED.*1.*/SHARED=1/' Makefile`   # enable shared
+    `sed -i 's/.*#SHARED.*1.*/SHARED=1/' Makefile` # enable shared
   end
 
   def self.build

packages/vim_runtime.rb

@@ -13,13 +13,13 @@ class Vim_runtime < Autotools
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/vim_runtime/9.0.1863_armv7l/vim_runtime-9.0.1863-chromeos-armv7l.tar.zst',
      armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/vim_runtime/9.0.1863_armv7l/vim_runtime-9.0.1863-chromeos-armv7l.tar.zst',
        i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/vim_runtime/9.0.1863_i686/vim_runtime-9.0.1863-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/vim_runtime/9.0.1863_x86_64/vim_runtime-9.0.1863-chromeos-x86_64.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/vim_runtime/9.0.1863_x86_64/vim_runtime-9.0.1863-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
     aarch64: 'e7f026ebc26ae12398190529cebaf1ce76f9011c5248e9cd92dfc8492f5a9a04',
      armv7l: 'e7f026ebc26ae12398190529cebaf1ce76f9011c5248e9cd92dfc8492f5a9a04',
        i686: '99ca1d5f1ebe16752f20c14542d28d3ae3cbbaf9a9782f259659f9f02fbfc215',
-     x86_64: 'd8f07c611d04450e691475a3563a2f00492c05383989638b5022aae56a25cbea',
+     x86_64: 'd8f07c611d04450e691475a3563a2f00492c05383989638b5022aae56a25cbea'
   })
 
   depends_on 'gpm'

packages/wayland_proxy_virtwl.rb

@@ -42,11 +42,11 @@ class Wayland_proxy_virtwl < Package
   end
 
   def self.postinstall
-    puts <<~'EOFSTRING'.lightblue
+    puts <<~EOFSTRING.lightblue
       Note that there is not yet hardware acceleration in wayland-proxy-virtwl.
       wayland-proxy-virtwl example usage (before running a gui program):
     EOFSTRING
-    puts <<~'EOFSHELLCODE'.lightcyan
+    puts <<~EOFSHELLCODE.lightcyan
       wayland-proxy-virtwl --wayland-display wayland-2 --x-display=2 --xrdb Xft.dpi:150 &
       export WAYLAND_DISPLAY=wayland-2
       export DISPLAY=:2