From 1558776ae7d626cf8c6d63dac01555e14567a678 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:13:49 +0200
Subject: gnu: texlive-latex-changebar -> texlive-changebar.

* gnu/packages/tex.scm (texlive-changebar): New variable.
(texlive-latex-changebar): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index fcd45af32f..770619b804 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -538,7 +538,7 @@ (define-public dblatex
                                              texlive-anysize
                                              texlive-appendix
                                              texlive-bookmark
-                                             texlive-latex-changebar
+                                             texlive-changebar
                                              texlive-latex-colortbl
                                              texlive-latex-fancybox
                                              texlive-fancyhdr
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6f948abcf7..3390978bdf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6544,29 +6544,31 @@ (define-public texlive-bookmark
 
 (define-deprecated-package texlive-latex-bookmark texlive-bookmark)
 
-(define-public texlive-latex-changebar
+(define-public texlive-changebar
   (package
-    (name "texlive-latex-changebar")
+    (name "texlive-changebar")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "changebar"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "05x15ilynqrl448h8l6qiraygamdldlngz89a2bw7kg74fym14ch"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/changebar/"
+                   "source/latex/changebar/"
+                   "tex/latex/changebar/")
+             (base32
+              "0y32inrdpki6v3dwyymfglf78wbfd29b6xa8vjn337dr4gxlma85")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/changebar"))
     (home-page "https://www.ctan.org/pkg/changebar")
     (synopsis "Generate changebars in LaTeX documents")
     (description
      "Identify areas of text to be marked with changebars with the
 @code{\\cbstart} and @code{\\cbend} commands; the bars may be coloured.  The
-package uses @code{drivers} to place the bars; the available drivers can work
-with @code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI
+package uses drivers to place the bars; the available drivers can work with
+@code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI
 drivers, and VTeX and pdfTeX.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-changebar texlive-changebar)
+
 (define-public texlive-latex-cmap
   (package
     (name "texlive-latex-cmap")
-- 
cgit v1.2.3