From 7c06640f71b64ba72ccab1dbab2fc2f5e24afc4a Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 17:25:36 -0500
Subject: [PATCH 13/37] gnu: qtserialport: Remove variable.

* gnu/packages/qt.scm (qtserialport): Remove variable.
* gnu/packages/qt.scm (qtserialport-5): New variable.
---
 gnu/packages/astronomy.scm   | 2 +-
 gnu/packages/engineering.scm | 2 +-
 gnu/packages/geo.scm         | 2 +-
 gnu/packages/kde.scm         | 2 +-
 gnu/packages/qt.scm          | 8 ++++----
 gnu/packages/radio.scm       | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 8fca3a6c4e..cb318d6c33 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -416,7 +416,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtscript" ,qtscript)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("zlib" ,zlib)))
     (native-inputs
      `(("gettext" ,gettext-minimal)     ; xgettext is used at compile time
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 85f4c83746..50c2e9b2be 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -702,7 +702,7 @@ multipole-accelerated algorithm.")
                        "phoenix.pro")))))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("libgit2" ,libgit2)
        ("boost" ,boost)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a03e37515e..15ea116a46 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2286,7 +2286,7 @@ growing set of geoscientific methods.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtkeychain" ,qtkeychain)
        ("qtlocation" ,qtlocation)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qwt" ,qwt)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 55832f0f2a..aee8648eb2 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -842,7 +842,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
        ("libcerf" ,libcerf)
        ("lz4" ,lz4)
        ("netcdf" ,netcdf)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("zlib" ,zlib)))
     (home-page "https://labplot.kde.org/")
     (synopsis "Interactive graphing and analysis of scientific data")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f24f0f1416..2000d65ec1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1236,7 +1236,7 @@ compositor libraries.")))
     (description "The Qt Wayland module provides the QtWayland client and
 compositor libraries.")))
 
-(define-public qtserialport
+(define-public qtserialport-5
   (package (inherit qtsvg-5)
     (name "qtserialport")
     (version "5.15.2")
@@ -1293,7 +1293,7 @@ interacting with serial ports from within Qt.")))
     (inputs
      `(("libsocketcan" ,libsocketcan)
        ("qtbase" ,qtbase-5)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (synopsis "Qt Serial Bus module")
     (description "The Qt Serial Bus API provides classes and functions to
 access the various industrial serial buses and protocols, such as CAN, ModBus,
@@ -1393,7 +1393,7 @@ native APIs where it makes sense.")))
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (inputs
      `(("icu4c" ,icu4c)
        ("openssl" ,openssl)
@@ -2222,7 +2222,7 @@ module provides support functions to the automatically generated code.")
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
        ("qtwebchannel" ,qtwebchannel)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 85f510dc30..734ddb66dc 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -950,7 +950,7 @@ users.")
        ("libusb" ,libusb)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (arguments
      `(#:tests? #f ; No test suite
        #:phases
@@ -1009,7 +1009,7 @@ weak-signal conditions.")
        ("libusb" ,libusb)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (arguments
      `(#:tests? #f ; No test suite
        #:phases
@@ -1803,7 +1803,7 @@ voice formats.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtspeech" ,qtspeech)
        ("qtwebsockets" ,qtwebsockets-5)
        ("rtl-sdr" ,rtl-sdr)
@@ -1880,7 +1880,7 @@ software-defined radio receivers.")
        `(("qcustomplot" ,qcustomplot)
          ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia-5)
-         ("qtserialport" ,qtserialport)))
+         ("qtserialport" ,qtserialport-5)))
       (arguments
        `(#:tests? #f  ; No test suite.
          #:phases
-- 
2.31.1