gnu: polari: Move to (gnu packages gnome-circle).

* gnu/packages/gnome-circle.scm (polari): New variable.
* gnu/packages/gnome.scm (polari): Replace with deprecated alias.

Change-Id: I3a6bc478ebc3657ea35f66733b793b28a4d6017b
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>

2 files changed, 68 insertions, 64 deletions

diff --git a/gnu/packages/gnome-circle.scm b/gnu/packages/gnome-circle.scm
index c0fa585d8c5..10195006ada 100644
--- a/gnu/packages/gnome-circle.scm
+++ b/gnu/packages/gnome-circle.scm
@@ -67,6 +67,7 @@
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
@@ -483,6 +484,71 @@ developed with the aim of being used with the Librem 5 phone.")
     (description "This package provides more recent servers for Komikku.")
     (license license:gpl3+)))
 
+(define-public polari
+  (package
+    (name "polari")
+    (version "46.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/polari/"
+                                  (version-major version)
+                                  "/polari-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0c8a6q6g1mgpc9g423rgqplbpjwb7zq1bvylad7jk2ci6yg71cfj"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "meson.build"
+               (("gtk_update_icon_cache: true")
+                "gtk_update_icon_cache: false"))))
+         (add-after 'install 'fix-desktop-file
+           ;; Hard-code launcher to be on the safe side.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* (search-input-file
+                           outputs
+                           "share/applications/org.gnome.Polari.desktop")
+               (("Exec=.*")
+                (string-append "Exec=" (search-input-file outputs "bin/polari")
+                               "\n")))))
+         (add-after 'glib-or-gtk-wrap 'wrap-typelib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (wrap-program (search-input-file outputs "bin/polari")
+               `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
+    (native-inputs
+     (list desktop-file-utils
+           gettext-minimal
+           `(,glib "bin")
+           gobject-introspection
+           pkg-config
+           yelp-tools))
+    (inputs
+     (list bash-minimal
+           glib
+           gsettings-desktop-schemas
+           gspell
+           gtk
+           gjs
+           libadwaita
+           libsecret
+           libsoup
+           telepathy-glib
+           telepathy-logger
+           tinysparql))
+    (propagated-inputs
+     (list telepathy-idle
+           telepathy-mission-control))
+    (synopsis "Simple IRC Client")
+    (description
+     "Polari is a simple Internet Relay Chat (IRC) client that is designed to
+integrate seamlessly with the GNOME desktop.")
+    (home-page "https://wiki.gnome.org/Apps/Polari")
+    (license license:gpl2+)))
+
 (define-public raider
   (package
     (name "raider")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f796af1bfe4..9430a6be559 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12560,70 +12560,8 @@ desktop environment.")
     (home-page "https://wiki.gnome.org/Apps/Gnote")
     (license license:gpl3+)))
 
-(define-public polari
-  (package
-    (name "polari")
-    (version "46.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/polari/"
-                                  (version-major version)
-                                  "/polari-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0c8a6q6g1mgpc9g423rgqplbpjwb7zq1bvylad7jk2ci6yg71cfj"))))
-    (build-system meson-build-system)
-    (arguments
-     `(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           (lambda _
-             (substitute* "meson.build"
-               (("gtk_update_icon_cache: true")
-                "gtk_update_icon_cache: false"))))
-         (add-after 'install 'fix-desktop-file
-           ;; Hard-code launcher to be on the safe side.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* (search-input-file
-                           outputs
-                           "share/applications/org.gnome.Polari.desktop")
-               (("Exec=.*")
-                (string-append "Exec=" (search-input-file outputs "bin/polari")
-                               "\n")))))
-         (add-after 'glib-or-gtk-wrap 'wrap-typelib
-           (lambda* (#:key outputs #:allow-other-keys)
-             (wrap-program (search-input-file outputs "bin/polari")
-               `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
-    (native-inputs
-     (list desktop-file-utils
-           gettext-minimal
-           `(,glib "bin")
-           gobject-introspection
-           pkg-config
-           yelp-tools))
-    (inputs
-     (list bash-minimal
-           glib
-           gsettings-desktop-schemas
-           gspell
-           gtk
-           gjs
-           libadwaita
-           libsecret
-           libsoup
-           telepathy-glib
-           telepathy-logger
-           tinysparql))
-    (propagated-inputs
-     (list telepathy-idle
-           telepathy-mission-control))
-    (synopsis "Simple IRC Client")
-    (description
-     "Polari is a simple Internet Relay Chat (IRC) client that is designed to
-integrate seamlessly with the GNOME desktop.")
-    (home-page "https://wiki.gnome.org/Apps/Polari")
-    (license license:gpl2+)))
+(define-deprecated/public-alias polari
+  (@ (gnu packages gnome-circle) polari))
 
 (define-public gnome-boxes
   (package