From 1f567c2ebc69f4c01c733c49a7fc13c6425179cc Mon Sep 17 00:00:00 2001
From: Maximilian Downey Twiss <creatorsmithmdt@gmail.com>
Date: Tue, 13 Jun 2023 01:31:54 +1000
Subject: [PATCH] Remove simple (and unnecessary) uses of @_ver (#8370)

---
 packages/cairomm_1_0.rb             | 3 +--
 packages/cairomm_1_16.rb            | 3 +--
 packages/cantarell_fonts.rb         | 3 +--
 packages/cunit.rb                   | 3 +--
 packages/dav1d.rb                   | 3 +--
 packages/ffmpeg.rb                  | 3 +--
 packages/glibmm_2_4.rb              | 3 +--
 packages/glibmm_2_68.rb             | 3 +--
 packages/gtksourceview_3.rb         | 3 +--
 packages/libaio.rb                  | 3 +--
 packages/libexiv2.rb                | 3 +--
 packages/libminigbm.rb              | 3 +--
 packages/librsvg.rb                 | 3 +--
 packages/libssh2.rb                 | 3 +--
 packages/libxdmcp.rb                | 3 +--
 packages/mjpegtools.rb              | 3 +--
 packages/mm_common.rb               | 3 +--
 packages/musl_expat.rb              | 3 +--
 packages/musl_libunwind.rb          | 3 +--
 packages/musl_ncurses.rb            | 3 +--
 packages/nasm.rb                    | 3 +--
 packages/openhab.rb                 | 3 +--
 packages/pangomm_1_4.rb             | 3 +--
 packages/pangomm_2_48.rb            | 3 +--
 packages/pcre.rb                    | 3 +--
 packages/pcre2.rb                   | 3 +--
 packages/rav1e.rb                   | 3 +--
 packages/virglrenderer.rb           | 3 +--
 packages/webrtc_audio_processing.rb | 3 +--
 packages/zsh.rb                     | 3 +--
 30 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/packages/cairomm_1_0.rb b/packages/cairomm_1_0.rb
index 8b663c56e..6d1b19e90 100644
--- a/packages/cairomm_1_0.rb
+++ b/packages/cairomm_1_0.rb
@@ -3,8 +3,7 @@ require 'package'
 class Cairomm_1_0 < Package
   description 'The Cairomm package provides a C++ interface to Cairo.'
   homepage 'https://www.cairographics.org/'
-  @_ver = '1.14.4'
-  version @_ver
+  version '1.14.4'
   license 'LGPL-2+'
   compatibility 'all'
   source_url 'https://gitlab.freedesktop.org/cairo/cairomm.git'
diff --git a/packages/cairomm_1_16.rb b/packages/cairomm_1_16.rb
index 2b7441632..f980691a3 100644
--- a/packages/cairomm_1_16.rb
+++ b/packages/cairomm_1_16.rb
@@ -3,8 +3,7 @@ require 'package'
 class Cairomm_1_16 < Package
   description 'The Cairomm package provides a C++ interface to Cairo.'
   homepage 'https://www.cairographics.org/'
-  @_ver = '1.16.2'
-  version @_ver
+  version '1.16.2'
   license 'LGPL-2+'
   compatibility 'all'
   source_url 'https://gitlab.freedesktop.org/cairo/cairomm.git'
diff --git a/packages/cantarell_fonts.rb b/packages/cantarell_fonts.rb
index 941b78dc3..6c05d24c3 100644
--- a/packages/cantarell_fonts.rb
+++ b/packages/cantarell_fonts.rb
@@ -3,8 +3,7 @@ require 'package'
 class Cantarell_fonts < Package
   description 'Humanist sans serif font'
   homepage 'https://gitlab.gnome.org/GNOME/cantarell-fonts'
-  @_ver = '0.303.1'
-  version @_ver
+  version '0.303.1'
   license 'OFL-1.1'
   compatibility 'all'
   source_url 'https://download.gnome.org/core/43/43.0/sources/cantarell-fonts-0.303.1.tar.xz'
diff --git a/packages/cunit.rb b/packages/cunit.rb
index 5460c28f1..3cba81f5a 100644
--- a/packages/cunit.rb
+++ b/packages/cunit.rb
@@ -3,8 +3,7 @@ require 'package'
 class Cunit < Package
   description 'CUnit is an automated testing framework for C.'
   homepage 'http://cunit.sourceforge.net/'
-  @_ver = '2.1.3'
-  version @_ver
+  version '2.1.3'
   compatibility 'all'
   license 'LGPL-2'
   source_url 'https://sourceforge.net/projects/cunit/files/CUnit/2.1-3/CUnit-2.1-3.tar.bz2'
diff --git a/packages/dav1d.rb b/packages/dav1d.rb
index 58ed67130..8b0623af8 100644
--- a/packages/dav1d.rb
+++ b/packages/dav1d.rb
@@ -3,8 +3,7 @@ require 'package'
 class Dav1d < Package
   description '**dav1d** is a new **AV1** cross-platform **d**ecoder, open-source, and focused on speed and correctness.'
   homepage 'https://code.videolan.org/videolan/dav1d'
-  @_ver = '1.2.1'
-  version @_ver
+  version '1.2.1'
   license 'BSD-2'
   compatibility 'all'
   source_url 'https://code.videolan.org/videolan/dav1d.git'
diff --git a/packages/ffmpeg.rb b/packages/ffmpeg.rb
index 78b445dfc..fd4f81e44 100644
--- a/packages/ffmpeg.rb
+++ b/packages/ffmpeg.rb
@@ -3,8 +3,7 @@ require 'package'
 class Ffmpeg < Package
   description 'Complete solution to record, convert and stream audio and video'
   homepage 'https://ffmpeg.org/'
-  @_ver = '6.0-27205c0'
-  version @_ver
+  version '6.0-27205c0'
   license 'LGPL-2,1, GPL-2, GPL-3, and LGPL-3' # When changing ffmpeg's configure options, make sure this variable is still accurate.
   compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://git.ffmpeg.org/ffmpeg.git'
diff --git a/packages/glibmm_2_4.rb b/packages/glibmm_2_4.rb
index 9b2c826fc..29a9a2892 100644
--- a/packages/glibmm_2_4.rb
+++ b/packages/glibmm_2_4.rb
@@ -3,8 +3,7 @@ require 'package'
 class Glibmm_2_4 < Package
   description 'C++ bindings for GLib'
   homepage 'https://www.gtkmm.org'
-  @_ver = '2.66.5'
-  version @_ver
+  version '2.66.5'
   license 'LGPL-2.1+'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/glibmm.git'
diff --git a/packages/glibmm_2_68.rb b/packages/glibmm_2_68.rb
index e7d349a84..76498c554 100644
--- a/packages/glibmm_2_68.rb
+++ b/packages/glibmm_2_68.rb
@@ -3,8 +3,7 @@ require 'package'
 class Glibmm_2_68 < Package
   description 'C++ bindings for GLib api version 2.68'
   homepage 'https://www.gtkmm.org'
-  @_ver = '2.75.0'
-  version @_ver
+  version '2.75.0'
   license 'LGPL-2.1+'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/glibmm.git'
diff --git a/packages/gtksourceview_3.rb b/packages/gtksourceview_3.rb
index c0fec4530..de0159581 100644
--- a/packages/gtksourceview_3.rb
+++ b/packages/gtksourceview_3.rb
@@ -3,8 +3,7 @@ require 'package'
 class Gtksourceview_3 < Package
   description 'Source code editing widget'
   homepage 'https://wiki.gnome.org/Projects/GtkSourceView'
-  @_ver = '3.24.11'
-  version @_ver
+  version '3.24.11'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz'
diff --git a/packages/libaio.rb b/packages/libaio.rb
index abefb75a9..98e1093e3 100644
--- a/packages/libaio.rb
+++ b/packages/libaio.rb
@@ -3,8 +3,7 @@ require 'package'
 class Libaio < Package
   description 'Linux-native asynchronous I/O access library'
   homepage 'https://pagure.io/libaio'
-  @_ver = '0.3.113-932de6c'
-  version @_ver
+  version '0.3.113-932de6c'
   license 'LGPL-2'
   # Use release patched to fix lto issues as per
   # https://marc.info/?l=linux-aio&m=164999309120529&w=2
diff --git a/packages/libexiv2.rb b/packages/libexiv2.rb
index 1e69aa6d6..086ed83bc 100644
--- a/packages/libexiv2.rb
+++ b/packages/libexiv2.rb
@@ -3,8 +3,7 @@ require 'package'
 class Libexiv2 < Package
   description 'Exiv2 is a Cross-platform C++ library and a command line utility to manage image metadata.'
   homepage 'http://exiv2.org/'
-  @_ver = '0.27.5'
-  version @_ver
+  version '0.27.5'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://github.com/Exiv2/exiv2/archive/refs/tags/v0.27.5.tar.gz'
diff --git a/packages/libminigbm.rb b/packages/libminigbm.rb
index 29f2d99ab..1e1b75704 100644
--- a/packages/libminigbm.rb
+++ b/packages/libminigbm.rb
@@ -7,8 +7,7 @@ class Libminigbm < Package
   description 'Generic Buffer Management GBM implementation used in Chromium OS'
   homepage 'https://chromium.googlesource.com/chromiumos/platform/minigbm/'
   git_hashtag '407eb0ebf3ce52fd4b3d79712d1b86d7b021c29b'
-  @_ver = git_hashtag[0, 7]
-  version @_ver
+  version git_hashtag[0, 7]
   license 'custom'
   compatibility 'all'
   source_url 'https://chromium.googlesource.com/chromiumos/platform/minigbm.git'
diff --git a/packages/librsvg.rb b/packages/librsvg.rb
index 7fab2b9de..2fac1bde8 100644
--- a/packages/librsvg.rb
+++ b/packages/librsvg.rb
@@ -3,8 +3,7 @@ require 'package'
 class Librsvg < Package
   description 'SVG library for GNOME'
   homepage 'https://wiki.gnome.org/Projects/LibRsvg'
-  @_ver = '2.56.0-59d5d83'
-  version @_ver
+  version '2.56.0-59d5d83'
   license 'LGPL-2+'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/librsvg.git'
diff --git a/packages/libssh2.rb b/packages/libssh2.rb
index 03cef0b4f..a2cfc3872 100644
--- a/packages/libssh2.rb
+++ b/packages/libssh2.rb
@@ -3,8 +3,7 @@ require 'package'
 class Libssh2 < Package
   description 'libssh2 is a client-side C library implementing the SSH2 protocol.'
   homepage 'https://www.libssh2.org/'
-  @_ver = '1.10.0'
-  version @_ver
+  version '1.10.0'
   compatibility 'all'
   license 'BSD'
   source_url 'https://www.libssh2.org/download/libssh2-1.10.0.tar.gz'
diff --git a/packages/libxdmcp.rb b/packages/libxdmcp.rb
index c846159e2..7aff80b5b 100644
--- a/packages/libxdmcp.rb
+++ b/packages/libxdmcp.rb
@@ -3,8 +3,7 @@ require 'package'
 class Libxdmcp < Package
   description 'The libXdmcp package contains a library implementing the X Display Manager Control Protocol.'
   homepage 'http://www.x.org'
-  @_ver = '4a71fdf'
-  version @_ver
+  version '4a71fdf'
   license 'MIT'
   compatibility 'all'
   source_url 'https://gitlab.freedesktop.org/xorg/lib/libxdmcp.git'
diff --git a/packages/mjpegtools.rb b/packages/mjpegtools.rb
index afdb87eda..019d031d2 100644
--- a/packages/mjpegtools.rb
+++ b/packages/mjpegtools.rb
@@ -3,8 +3,7 @@ require 'package'
 class Mjpegtools < Package
   description 'Video capture, editing, playback, and compression to MPEG of MJPEG video'
   homepage 'https://mjpeg.sourceforge.io/'
-  @_ver = '2.2.1'
-  version @_ver
+  version '2.2.1'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://sourceforge.net/projects/mjpeg/files/mjpegtools/2.2.1/mjpegtools-2.2.1.tar.gz'
diff --git a/packages/mm_common.rb b/packages/mm_common.rb
index 5ccfb3f1e..f1505f8ba 100644
--- a/packages/mm_common.rb
+++ b/packages/mm_common.rb
@@ -3,8 +3,7 @@ require 'package'
 class Mm_common < Package
   description 'Common build files of the C++ bindings'
   homepage 'http://www.gtkmm.org/'
-  @_ver = '1.0.5'
-  version @_ver
+  version '1.0.5'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/mm-common.git'
diff --git a/packages/musl_expat.rb b/packages/musl_expat.rb
index b74fed4b9..f60b13aaa 100644
--- a/packages/musl_expat.rb
+++ b/packages/musl_expat.rb
@@ -3,8 +3,7 @@ require 'package'
 class Musl_expat < Package
   description 'James Clark\'s Expat XML parser library in C.'
   homepage 'https://sourceforge.net/projects/expat/'
-  @_ver = '2.4.8'
-  version @_ver
+  version '2.4.8'
   license 'MIT'
   compatibility 'all'
   source_url 'https://prdownloads.sourceforge.net/project/expat/expat/2.4.8/expat-2.4.8.tar.xz'
diff --git a/packages/musl_libunwind.rb b/packages/musl_libunwind.rb
index c22f05235..afe36a4dd 100644
--- a/packages/musl_libunwind.rb
+++ b/packages/musl_libunwind.rb
@@ -3,8 +3,7 @@ require 'package'
 class Musl_libunwind < Package
   description 'libunwind is a portable and efficient C programming interface (API) to determine the call-chain of a program.'
   homepage 'https://www.nongnu.org/libunwind/'
-  @_ver = '1.5.0'
-  version @_ver
+  version '1.5.0'
   license 'MIT'
   compatibility 'all'
   source_url 'https://download.savannah.gnu.org/releases/libunwind/libunwind-1.5.0.tar.gz'
diff --git a/packages/musl_ncurses.rb b/packages/musl_ncurses.rb
index e76b3cd34..3ce0fbdc1 100644
--- a/packages/musl_ncurses.rb
+++ b/packages/musl_ncurses.rb
@@ -3,8 +3,7 @@ require 'package'
 class Musl_ncurses < Package
   description 'The ncurses (new curses) library is a free software emulation of curses in System V Release 4.0 (SVr4), and more. — Wide character'
   homepage 'https://www.gnu.org/software/ncurses/'
-  @_ver = '6.3-20220402'
-  version @_ver
+  version '6.3-20220402'
   license 'MIT'
   compatibility 'all'
   source_url 'https://github.com/mirror/ncurses.git'
diff --git a/packages/nasm.rb b/packages/nasm.rb
index e9b13d2de..374cf3fae 100644
--- a/packages/nasm.rb
+++ b/packages/nasm.rb
@@ -3,8 +3,7 @@ require 'package'
 class Nasm < Package
   description 'The Netwide Assembler'
   homepage 'https://www.nasm.us/'
-  @_ver = '2.15.05'
-  version @_ver
+  version '2.15.05'
   license 'BSD'
   compatibility 'all'
   source_url 'https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz'
diff --git a/packages/openhab.rb b/packages/openhab.rb
index e0b1457b9..50b1bf0e3 100644
--- a/packages/openhab.rb
+++ b/packages/openhab.rb
@@ -3,8 +3,7 @@ require 'package'
 class Openhab < Package
   description 'A vendor and technology agnostic open source automation software for your home'
   homepage 'https://www.openhab.org/'
-  @_ver = '3.2.0'
-  version @_ver
+  version '3.2.0'
   license 'Eclipse Public License 2.0'
   compatibility 'x86_64'
   source_url 'https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab/3.2.0/openhab-3.2.0.tar.gz'
diff --git a/packages/pangomm_1_4.rb b/packages/pangomm_1_4.rb
index 77c8d97f6..a9f26c83e 100644
--- a/packages/pangomm_1_4.rb
+++ b/packages/pangomm_1_4.rb
@@ -3,8 +3,7 @@ require 'package'
 class Pangomm_1_4 < Package
   description 'pangomm is the official C++ interface for the Pango font layout library.'
   homepage 'https://developer.gnome.org/pangomm/stable/'
-  @_ver = '2.46.3'
-  version @_ver
+  version '2.46.3'
   license 'LGPL-2.1+'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/pangomm.git'
diff --git a/packages/pangomm_2_48.rb b/packages/pangomm_2_48.rb
index 6bb6d79dd..532087e0b 100644
--- a/packages/pangomm_2_48.rb
+++ b/packages/pangomm_2_48.rb
@@ -3,8 +3,7 @@ require 'package'
 class Pangomm_2_48 < Package
   description 'pangomm is the official C++ interface for the Pango font layout library.'
   homepage 'https://developer.gnome.org/pangomm/stable/'
-  @_ver = '2.50.1'
-  version @_ver
+  version '2.50.1'
   license 'LGPL-2.1+'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/pangomm.git'
diff --git a/packages/pcre.rb b/packages/pcre.rb
index 9bb4cc21b..e7c5a0b12 100644
--- a/packages/pcre.rb
+++ b/packages/pcre.rb
@@ -3,8 +3,7 @@ require 'package'
 class Pcre < Package
   description 'The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5.'
   homepage 'http://pcre.org/'
-  @_ver = '8.45'
-  version @_ver
+  version '8.45'
   license 'BSD-3'
   compatibility 'all'
   source_url 'https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.bz2'
diff --git a/packages/pcre2.rb b/packages/pcre2.rb
index 57536996e..8c064b034 100644
--- a/packages/pcre2.rb
+++ b/packages/pcre2.rb
@@ -3,8 +3,7 @@ require 'package'
 class Pcre2 < Package
   description 'The PCRE2 package contains a new generation of the Perl Compatible Regular Expression libraries.'
   homepage 'http://pcre.org/'
-  @_ver = '10.42'
-  version @_ver
+  version '10.42'
   license 'BSD-3'
   compatibility 'all'
   source_url 'https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.gz'
diff --git a/packages/rav1e.rb b/packages/rav1e.rb
index 809298d9c..48994b9b8 100644
--- a/packages/rav1e.rb
+++ b/packages/rav1e.rb
@@ -3,8 +3,7 @@ require 'package'
 class Rav1e < Package
   description 'An AV1 encoder focused on speed and safety'
   homepage 'https://github.com/xiph/rav1e/'
-  @_ver = '0.5.1-p20220927'
-  version @_ver
+  version '0.5.1-p20220927'
   license 'BSD-2, Apache-2.0, MIT and Unlicense'
   compatibility 'all'
   source_url 'https://github.com/xiph/rav1e.git'
diff --git a/packages/virglrenderer.rb b/packages/virglrenderer.rb
index 06b454624..f3474264a 100644
--- a/packages/virglrenderer.rb
+++ b/packages/virglrenderer.rb
@@ -3,8 +3,7 @@ require 'package'
 class Virglrenderer < Package
   description 'Virtual OpenGL renderer for QEMU virtual machines'
   homepage 'https://virgil3d.github.io/'
-  @_ver = '0.9.1-486d891'
-  version @_ver
+  version '0.9.1-486d891'
   license 'MIT'
   compatibility 'all'
   source_url 'https://gitlab.freedesktop.org/virgl/virglrenderer.git'
diff --git a/packages/webrtc_audio_processing.rb b/packages/webrtc_audio_processing.rb
index 0673e50d8..73ebfd57f 100644
--- a/packages/webrtc_audio_processing.rb
+++ b/packages/webrtc_audio_processing.rb
@@ -3,8 +3,7 @@ require 'package'
 class Webrtc_audio_processing < Package
   description 'AudioProcessing library based on Googles implementation of WebRTC'
   homepage 'https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/'
-  @_ver = '0.3.1'
-  version @_ver
+  version '0.3.1'
   license 'BSD'
   compatibility 'all'
   source_url 'https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v0.3.1/webrtc-audio-processing-v0.3.1.tar.bz2'
diff --git a/packages/zsh.rb b/packages/zsh.rb
index 54f004f8b..582c3f541 100644
--- a/packages/zsh.rb
+++ b/packages/zsh.rb
@@ -3,8 +3,7 @@ require 'package'
 class Zsh < Package
   description 'Zsh is a shell designed for interactive use, although it is also a powerful scripting language.'
   homepage 'http://zsh.sourceforge.net/'
-  @_ver = '5.9'
-  version @_ver
+  version '5.9'
   license 'ZSH and GPL-2'
   compatibility 'all'
   source_url 'https://downloads.sourceforge.net/project/zsh/zsh/5.9/zsh-5.9.tar.xz'