From 5614cc205c8ef9dc10f24726ea959f13220fac13 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Thu, 25 Aug 2022 19:17:54 +0800
Subject: [PATCH 4/9] gnu: python-pyqt: Rename to python-pyqt-5.

Automated by following scripts and some manually fix:

  git grep -l '\bpython-pyqt\b' | xargs sed -E \
    -e 's/,python-pyqt/\0-5/g' \
    -e 's/pyqt$/\0-5/g' \
    -e 's/pyqt /pyqt-5 /g' \
    -e 's/pyqt\)/pyqt-5)/g' -i
---
 gnu/packages/audio.scm        |  4 ++--
 gnu/packages/chemistry.scm    |  2 +-
 gnu/packages/cups.scm         |  2 +-
 gnu/packages/education.scm    |  2 +-
 gnu/packages/engineering.scm  |  2 +-
 gnu/packages/finance.scm      |  6 +++---
 gnu/packages/games.scm        |  2 +-
 gnu/packages/maths.scm        |  2 +-
 gnu/packages/music.scm        |  4 ++--
 gnu/packages/pdf.scm          |  4 ++--
 gnu/packages/photo.scm        |  2 +-
 gnu/packages/plotutils.scm    |  2 +-
 gnu/packages/python-web.scm   |  2 +-
 gnu/packages/python-xyz.scm   |  8 ++++----
 gnu/packages/qt.scm           | 14 +++++++-------
 gnu/packages/radio.scm        |  6 +++---
 gnu/packages/stenography.scm  |  2 +-
 gnu/packages/text-editors.scm |  2 +-
 gnu/packages/video.scm        |  2 +-
 gnu/packages/web-browsers.scm |  2 +-
 20 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index c0bfb3b9d8..083b9ca971 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5104,9 +5104,9 @@ (define-public carla
            gtk+-2              ;needed for bridging GTK2 plugins in GTK3 hosts
            gtk+
            python-pyliblo
-           python-pyqt
+           python-pyqt-5
            python-rdflib
-           ;; python-pyqt shows the following error without python-wrapper:
+           ;; python-pyqt-5 shows the following error without python-wrapper:
            ;; Error while finding module specification for 'PyQt5.uic.pyuic'
            ;; (ModuleNotFoundError: No module named 'PyQt5')
            python-wrapper
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 735d599d2d..f00e96bdc2 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -555,7 +555,7 @@ (define-public python-pymol
            libxml2
            mmtf-cpp
            msgpack
-           python-pyqt
+           python-pyqt-5
            glm
            netcdf))
     (native-inputs
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 3de9ddbf22..7e5ddaa7e3 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -689,7 +689,7 @@ (define-public hplip
        ("python" ,python)
        ("python-dbus" ,python-dbus)
        ("python-pygobject" ,python-pygobject)
-       ("python-pyqt" ,python-pyqt)
+       ("python-pyqt" ,python-pyqt-5)
        ("python-wrapper" ,python-wrapper)
        ("sane-backends" ,sane-backends-minimal)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index b2e8eb4568..d11f4e956e 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -434,7 +434,7 @@ (define-public toutenclic
     (native-inputs
      (list unzip))
     (inputs
-     (list python-pyqt))
+     (list python-pyqt-5))
     (synopsis "School tools for physically disabled children")
     (description "ToutEnClic is intended to facilitate the schooling
 of physically disabled children in ordinary schools.  It is both
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f195179413..947047fd11 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3418,7 +3418,7 @@ (define-public uranium
            python
            python-cryptography
            python-numpy
-           python-pyqt
+           python-pyqt-5
            python-scipy
            python-shapely
            python-trimesh
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 849f9aba99..79f00e3738 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -581,7 +581,7 @@ (define-public electrum
            python-hidapi
            python-ledgerblue
            python-protobuf
-           python-pyqt
+           python-pyqt-5
            python-qdarkstyle
            python-qrcode
            zbar))
@@ -680,7 +680,7 @@ (define-public electron-cash
            python-pathvalidate
            python-protobuf
            python-pyaes
-           python-pyqt
+           python-pyqt-5
            python-pysocks
            python-qdarkstyle
            python-qrcode
@@ -1100,7 +1100,7 @@ (define-public python-trezor
            python-black
            python-isort
            python-protobuf
-           python-pyqt
+           python-pyqt-5
            python-pytest))
     (home-page "https://github.com/trezor/python-trezor")
     (synopsis "Python library for communicating with TREZOR Hardware Wallet")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5dc7298acb..b40fde45a4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10503,7 +10503,7 @@ (define-public kajongg
            libkmahjongg
            python
            python-twisted
-           python-pyqt
+           python-pyqt-5
            python-zope-interface
            qtbase-5
            qtsvg-5))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 72d5e9a83a..947578c038 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3150,7 +3150,7 @@ (define-public veusz
      (list ghostscript ;optional, for EPS/PS output
            python-dbus
            python-h5py ;optional, for HDF5 data
-           python-pyqt
+           python-pyqt-5
            qtbase-5
            qtsvg-5))
     (propagated-inputs
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index e1de632dda..cedfb4fee7 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2890,7 +2890,7 @@ (define-public frescobaldi
            python-ly
            python-poppler-qt5
            python-pyportmidi
-           python-pyqt
+           python-pyqt-5
            python-sip))
     (home-page "https://www.frescobaldi.org/")
     (synopsis "LilyPond sheet music text editor")
@@ -3553,7 +3553,7 @@ (define-public picard
      `(("gettext" ,gettext-minimal)
        ("python-dateutil" ,python-dateutil)))
     (inputs
-     (list chromaprint python-discid python-pyqt python-mutagen))
+     (list chromaprint python-discid python-pyqt-5 python-mutagen))
     (home-page "https://picard.musicbrainz.org/")
     (synopsis "Graphical music tagging application")
     (description
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 39266a2822..d94c2e2f75 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -180,7 +180,7 @@ (define-public flyer-composer
                    (,(string-append qtbase "/lib/qt5/plugins/platforms"))))
                #t))))))
     (inputs
-     (list python-pypdf2 python-pyqt python-poppler-qt5 qtbase-5))
+     (list python-pypdf2 python-pyqt-5 python-poppler-qt5 qtbase-5))
     (home-page "http://crazy-compilers.com/flyer-composer")
     (synopsis "Rearrange PDF pages to print as flyers on one sheet")
     (description "@command{flyer-composer} can be used to prepare one- or
@@ -351,7 +351,7 @@ (define-public python-poppler-qt5
     (native-inputs
      (list pkg-config))
     (inputs
-     (list python-sip-4 python-pyqt poppler-qt5 qtbase-5))
+     (list python-sip-4 python-pyqt-5 poppler-qt5 qtbase-5))
     (home-page "https://pypi.org/project/python-poppler-qt5/")
     (synopsis "Python bindings for Poppler-Qt5")
     (description
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 19c171a9bb..56806ad014 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -118,7 +118,7 @@ (define-public rapid-photo-downloader
        ("libnotify" ,libnotify)
        ("libmediainfo" ,libmediainfo)
        ("usdisks" ,udisks)
-       ("python-pyqt" ,python-pyqt)
+       ("python-pyqt" ,python-pyqt-5)
        ("python-pygobject" ,python-pygobject)
        ("python-gphoto2" ,python-gphoto2)
        ("python-pyzmq" ,python-pyzmq)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index a5e1a1ad55..83a869137c 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -327,7 +327,7 @@ (define-public asymptote
            python
            python-cson
            python-numpy
-           python-pyqt
+           python-pyqt-5
            readline
            zlib))
     (arguments
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d060d5b27c..9c57aaa25e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7153,7 +7153,7 @@ (define-public python-woob
            python-lxml
            python-pillow
            python-prettytable
-           python-pyqt
+           python-pyqt-5
            python-pyyaml
            python-requests
            python-six
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d362850466..67d1128b88 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13584,7 +13584,7 @@ (define-public python-qtconsole
                (("def test_other_output") "def _test_other_output")))))))
     (propagated-inputs
      (list python-ipykernel python-ipython-genutils python-jupyter-client
-           python-jupyter-core python-pygments python-pyqt python-pyzmq
+           python-jupyter-core python-pygments python-pyqt-5 python-pyzmq
            python-qtpy python-traitlets))
     (native-inputs
      (list python-flaky python-pytest python-pytest-qt))
@@ -15596,7 +15596,7 @@ (define-public python-qasync
     (native-inputs
      (list python-pytest python-pytest-runner))
     (propagated-inputs
-     (list python-pyqt))
+     (list python-pyqt-5))
     (home-page "https://github.com/CabbageDevelopment/qasync")
     (synopsis "Implementation of the PEP 3156 Event-Loop with Qt")
     (description
@@ -25269,7 +25269,7 @@ (define-public offlate
             python-pyenchant
             python-pygit2
             python-pygithub
-            python-pyqt
+            python-pyqt-5
             python-requests
             python-ruamel.yaml
             python-translate-toolkit
@@ -26198,7 +26198,7 @@ (define-public pyzo
        ;; symbol: objc_getClass".
        #:tests? #f))
     (propagated-inputs
-     (list python-pyqt))
+     (list python-pyqt-5))
     (home-page "https://pyzo.org")
     (synopsis
      "Python IDE for scientific computing")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index df12c37964..25bc0a1dad 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2978,7 +2978,7 @@ (define-public python-sip-4
                        "--incdir" include)))))))
     (license license:gpl3)))
 
-(define-public python-pyqt
+(define-public python-pyqt-5
   (package
     (name "python-pyqt")
     (version "5.15.2")
@@ -3162,7 +3162,7 @@ (define-public python-pyqtwebengine-5
                        "--stubsdir" stubs
                        "--sipdir" sipdir
                        "--pyqt-sipdir" pyqt-sipdir))))
-         ;; Because this has a different prefix than python-pyqt then we need
+         ;; Because this has a different prefix than python-pyqt-5 then we need
          ;; to make this a namespace of its own.
          (add-after 'install 'make-namespace
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -3192,10 +3192,10 @@ (define-public python-pyqtwebengine-5
 ;; Ultimately, it would be nicer to have a more modular set of python-pyqt-*
 ;; packages that could be used together.
 (define-public python-pyqt-5-without-qtwebkit
-  (package/inherit python-pyqt
+  (package/inherit python-pyqt-5
     (name "python-pyqt-without-qtwebkit")
     (inputs
-     (alist-delete "qtwebkit" (package-inputs python-pyqt)))))
+     (alist-delete "qtwebkit" (package-inputs python-pyqt-5)))))
 
 (define-public python-pyqt-builder
   (package
@@ -3322,7 +3322,7 @@ (define-public python-qscintilla
     (inputs
      `(("qscintilla" ,qscintilla)
        ("python" ,python)
-       ("python-pyqt" ,python-pyqt)))
+       ("python-pyqt" ,python-pyqt-5)))
     (description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
 editor control.  QScintilla includes features especially useful when editing
 and debugging source code.  These include support for syntax styling, error
@@ -3334,7 +3334,7 @@ (define-public python-qscintilla
 ;; variables such as PYTHONPATH, so we need to build a union package to make
 ;; it work.
 (define-public python-pyqt+qscintilla
-  (package/inherit python-pyqt
+  (package/inherit python-pyqt-5
     (name "python-pyqt+qscintilla")
     (source #f)
     (build-system trivial-build-system)
@@ -3349,7 +3349,7 @@ (define-public python-pyqt+qscintilla
                                    directories)
                       #t)))))
     (inputs
-     `(("python-pyqt" ,python-pyqt)
+     `(("python-pyqt" ,python-pyqt-5)
        ("python-qscintilla" ,python-qscintilla)))
     (synopsis "Union of PyQt and the Qscintilla extension")
     (description
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 7d1d9da0b1..4f356d677d 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -734,7 +734,7 @@ (define-public gr-osmosdr
              log4cpp
              python
              python-numpy
-             python-pyqt
+             python-pyqt-5
              rtl-sdr
              soapysdr
              spdlog
@@ -1576,7 +1576,7 @@ (define-public nanovna-saver
     (native-inputs
      (list python-cython))
     (inputs
-     (list python-numpy python-pyqt python-pyserial python-scipy))
+     (list python-numpy python-pyqt-5 python-pyserial python-scipy))
     (arguments
      '(#:tests? #f))
     (home-page "https://github.com/NanoVNA-Saver/nanovna-saver")
@@ -2470,7 +2470,7 @@ (define-public urh
            python-numpy
            python-psutil
            python-pyaudio
-           python-pyqt
+           python-pyqt-5
            rtl-sdr))
     (arguments
      `(#:phases
diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm
index 3b86ab6bcf..2be3461a4d 100644
--- a/gnu/packages/stenography.scm
+++ b/gnu/packages/stenography.scm
@@ -49,7 +49,7 @@ (define-public plover
      (list python-pytest))
     (inputs
      (list python-appdirs
-           python-pyqt
+           python-pyqt-5
            python-babel
            python-dbus
            python-hidapi
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 839f812733..555d9cf620 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -770,7 +770,7 @@ (define-public manuskript
                    #:icon "manuskript"
                    #:categories "Office;WordProcessor;"))))))))
     (inputs
-     (list pandoc python-lxml python-markdown python-pyqt qtsvg-5))
+     (list pandoc python-lxml python-markdown python-pyqt-5 qtsvg-5))
     (home-page "http://www.theologeek.ch/manuskript/")
     (synopsis "Tool for writers")
     (description "Manuskript provides a rich environment to help
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 556eb46df4..40d74c741d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4762,7 +4762,7 @@ (define-public openshot
            font-dejavu
            libopenshot
            python
-           python-pyqt
+           python-pyqt-5
            python-pyzmq
            python-requests
            qtsvg-5))
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 634d9ea0bf..f2bb61d0bb 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -488,7 +488,7 @@ (define-public qutebrowser
            python-pygments
            python-pynacl
            python-pyyaml
-           ;; FIXME: python-pyqtwebengine-5 needs to come before python-pyqt so
+           ;; FIXME: python-pyqtwebengine-5 needs to come before python-pyqt-5 so
            ;; that it's __init__.py is used first.
            python-pyqtwebengine-5
            python-pyqt-5-without-qtwebkit
-- 
2.37.2