From a9634e2f231ea19c1f4ac49114d09eed8895fbce Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 23:52:11 +0200
Subject: [PATCH] gnu: texlive-latex-backend -> texlive-backend.

* gnu/packages/tex.scm (texlive-l3backend): New variable.
(texlive-latex-l3backend): Deprecate package.
(texlive-latex-base):
(texlive-xetex):
* gnu/packages/maths.scm (cddlib): Apply renaming.
---
 gnu/packages/maths.scm |  4 ++--
 gnu/packages/tex.scm   | 42 +++++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e829c30eb8..f0c00cd1a5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -30,7 +30,7 @@
 ;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
 ;;; Copyright © 2018, 2021 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
-;;; Copyright © 2019, 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2021-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
 ;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -846,7 +846,7 @@ integer programming problems and computes Markov bases for statistics.")
                          texlive-amsfonts
                          texlive-dvips-l3backend
                          texlive-graphics
-                         texlive-latex-l3backend
+                         texlive-l3backend
                          texlive-tiny))
     (arguments
      (list #:configure-flags
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be5072b9a4..e0619b105b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3205,7 +3205,7 @@ formats.")
              texlive-ukrhyph
              texlive-ruhyphen
              texlive-l3kernel
-             texlive-latex-l3backend
+             texlive-l3backend
              ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
              ;; and later. See:
              ;; https://tug.org/pipermail/tex-live/2021-June/047180.html
@@ -3912,34 +3912,38 @@ LaTeX3 conventions can be used with regular LaTeX2e packages.")
 
 (define-deprecated-package texlive-latex-l3kernel texlive-l3kernel)
 
-(define-public texlive-latex-l3backend
+(define-public texlive-l3backend
   (package
-    (name "texlive-latex-l3backend")
+    (name "texlive-l3backend")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "l3backend"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0mlwyzssqn6wkyv9hzp24d40p8f20zrjqgvqyqs1rd7q7awan42a"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/l3backend/"
+                   "dvips/l3backend/"
+                   "source/latex/l3backend/"
+                   "tex/latex/l3backend/")
+             (base32
+              "18i6aczhj7pvqgdwfgkbmjz7a8xgd5w2jhibrv8khqlvxp62in94")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/l3backend"
-       #:tex-engine "tex"
-       #:tex-format #f
-       #:texlive-latex-base #f))
+     (list
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:texlive-latex-base #f))
     (native-inputs
      (list texlive-docstrip))
-    (home-page "https://www.ctan.org/pkg/l3backend")
+    (home-page "https://ctan.org/pkg/l3backend")
     (synopsis "LaTeX3 backend drivers")
     (description
      "This package forms parts of expl3, and contains the code used to
-interface with backends (drivers) across the expl3 codebase. The functions
-here are defined differently depending on the engine in use. As such, these
+interface with backends (drivers) across the expl3 codebase.  The functions
+here are defined differently depending on the engine in use.  As such, these
 are distributed separately from l3kernel to allow this code to be updated on
 an independent schedule.")
-    (license license:lppl1.3c+)))
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-l3backend texlive-l3backend)
 
 (define-public texlive-latex-l3packages
   (package
@@ -12903,7 +12907,7 @@ itself may be shipped out to the DVI file.")
            texlive-hyphen-base
            texlive-latex-base
            texlive-fonts-latex
-           texlive-latex-l3backend
+           texlive-l3backend
            texlive-l3kernel
            texlive-latex-l3packages
            texlive-lm