gnu: texlive-latex-colortbl -> texlive-colortbl.

* gnu/packages/tex.scm (texlive-colortbl): New variable.
(texlive-latex-colortbl): Deprecate variable.
(texlive-jadetex):
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/maths.scm (hypre): Use new name.

3 files changed, 21 insertions, 16 deletions

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 770619b804..12da744453 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -539,7 +539,7 @@ the in DocBook SGML DTDs.")
                                              texlive-appendix
                                              texlive-bookmark
                                              texlive-changebar
-                                             texlive-latex-colortbl
+                                             texlive-colortbl
                                              texlive-latex-fancybox
                                              texlive-fancyhdr
                                              texlive-fancyvrb
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6466d1b8c7..c859b1d97a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5799,7 +5799,7 @@ set.")
                                      texlive-xypic
                                      texlive-listofitems
                                      texlive-cmap
-                                     texlive-latex-colortbl
+                                     texlive-colortbl
                                      texlive-latex-float
                                      texlive-fncychap
                                      texlive-framed
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a1b70ac463..3785ec3cd3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6590,26 +6590,31 @@ copy-and-paste functions work properly.")
 
 (define-deprecated-package texlive-latex-cmap texlive-cmap)
 
-(define-public texlive-latex-colortbl
+(define-public texlive-colortbl
   (package
-    (name "texlive-latex-colortbl")
+    (name "texlive-colortbl")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "colortbl"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1qa0mh0fy9hcvfsmprv6q50q0qzdjjfbxi3axap26z6zg3qj68bc"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/colortbl/"
+                   "source/latex/colortbl/"
+                   "tex/latex/colortbl/")
+             (base32
+              "0fb4a5l3yqk6l5gr0hlkqwpy004wi8zymyicdzjyhqwcib4jnzjs")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/colortbl"))
-    (home-page "https://www.ctan.org/pkg/colortbl")
+    (propagated-inputs
+     (list texlive-graphics
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/colortbl")
     (synopsis "Add colour to LaTeX tables")
     (description
-     "This package allows rows, columns, and even individual cells in LaTeX
-tables to be coloured.")
+     "The package allows rows and columns to be coloured, and even
+individual cells.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-colortbl texlive-colortbl)
+
 (define-public texlive-latex-fancybox
   (package
     (name "texlive-latex-fancybox")
@@ -7895,7 +7900,7 @@ Simple Young tableaux.
              ;; provided by the jknappen package collection.
              texlive-jknappen
              texlive-hyperref
-             texlive-latex-colortbl
+             texlive-colortbl
              texlive-fancyhdr
              texlive-graphics ;for color.sty
              texlive-tools ;for array.sty