From c181e83fba89e0fd643c67d84dacb35a91d643aa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 12 Oct 2021 14:46:42 +0200
Subject: gnu: Remove duplicate python-google-brotli package.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-compression.scm (python-brotli):
Delete duplicate variable.
* gnu/packages/compression.scm (python-google-brotli):
Redefine as a deprecated-package, with…
(python-brotli): …as the canonical variable.
* gnu/packages/fonts.scm (font-meera-inimai)[native-inputs]:
Adjust accordingly.
---
 gnu/packages/compression.scm        |  6 ++++--
 gnu/packages/django.scm             |  1 -
 gnu/packages/fonts.scm              |  2 +-
 gnu/packages/gnome.scm              |  1 -
 gnu/packages/python-compression.scm | 20 --------------------
 gnu/packages/python-web.scm         |  1 -
 6 files changed, 5 insertions(+), 26 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index aea56a7fa9..3098230bd5 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2225,16 +2225,18 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
 (define-public google-brotli
   (deprecated-package "google-brotli" brotli))
 
-(define-public python-google-brotli
+(define-public python-brotli
   (package
     (inherit brotli)
-    (name "python-google-brotli")
+    (name "python-brotli")
     (build-system python-build-system)
     (arguments '())
     (synopsis "Python interface to Brotli")
     (description "This package provides a Python interface to the @code{brotli}
 package, an implementation of the Brotli lossless compression algorithm.")))
 
+(define-public python-google-brotli
+  (deprecated-package "python-google-brotli" python-brotli))
 
 (define-public ucl
   (package
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f8aae1e33f..3d1c9d12c3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -37,7 +37,6 @@
   #:use-module (gnu packages geo)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c9a9e4f038..5cf2393177 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2050,7 +2050,7 @@ It comes in seven weights and Roman, Italic and Oblique styles.")
        ("harfbuzz" ,harfbuzz "bin")
        ("python" ,python-minimal)
        ("python-fonttools" ,python-fonttools)
-       ("python-google-brotli" ,python-google-brotli)))
+       ("python-brotli" ,python-brotli)))
     (arguments
      `(#:make-flags (list "PY=python3"
                           (string-append "DESTDIR=" %output)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index af4b953cb0..a60404d370 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -170,7 +170,6 @@
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 30062f43c5..81e1630e81 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -261,26 +261,6 @@ the LZ4 frame format.")
 (define-public python2-lzstring
   (package-with-python2 python-lzstring))
 
-(define-public python-brotli
-  (package
-    (name "python-brotli")
-    (version "1.0.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "Brotli" version ".zip"))
-        (sha256
-         (base32
-          "0f4433s4wv9masc303kkb1s0a09x81xwr8pdvj0kyxzdl05826sd"))))
-    (build-system python-build-system)
-    (native-inputs
-     `(("unzip" ,unzip)))
-    (home-page "https://github.com/google/brotli")
-    (synopsis "Python bindings for the Brotli compression library")
-    (description
-     "This package provides python bindings for the Brotli compression library.")
-    (license license:asl2.0)))
-
 (define-public bitshuffle
   (package
     (name "bitshuffle")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b99e358e26..dcb84d0b67 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -81,7 +81,6 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
-  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-science)
   #:use-module (gnu packages python-xyz)
-- 
cgit v1.2.3