04/07: gnu: Add texlive-ms.

[guix-commits]

ngz pushed a commit to branch core-updates
in repository guix.

commit 94268d502119c2b799cb49069fbbac8322d2dca7
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sun Feb 13 23:52:18 2022 +0100

    gnu: Add texlive-ms.
    
    * gnu/packages/tex.scm (texlive-ms): New variable.
    (texlive-latex-ms): Deprecate variable.
    * gnu/packages/bioinformatics.scm (discrover):
    * gnu/packages/python-xyz.scm (python-nbconvert): Use new variable.
---
 gnu/packages/bioinformatics.scm |  2 +-
 gnu/packages/python-xyz.scm     |  2 +-
 gnu/packages/tex.scm            | 66 ++++++++++++++++++++++++-----------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index c872c9c45a..c7761544b0 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3338,7 +3338,7 @@ data and settings.")
                                              texlive-fonts-ec
                                              texlive-latex-examplep
                                              texlive-hyperref
-                                             texlive-latex-ms
+                                             texlive-ms
                                              texlive-latex-natbib
                                              texlive-bibtex ; style files used 
by natbib
                                              texlive-latex-pgf ; tikz
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3bd382e12d..b09d366e71 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12625,7 +12625,7 @@ time.")
                                         texlive-grffile
                                         texlive-hyperref
                                         texlive-latex-jknapltx
-                                        texlive-latex-ms
+                                        texlive-ms
                                         texlive-oberdiek
                                         texlive-latex-parskip
                                         texlive-latex-trimspaces
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3b73807434..76ab1bed22 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7676,35 +7676,45 @@ including:
 It also ensures compatibility with the @code{media9} and @code{animate} 
packages.")
     (license license:lppl)))
 
-(define-public texlive-latex-ms
-  (package
-    (name "texlive-latex-ms")
-    (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "ms"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "04ww5abfm7dx81d21yr2gwy9jswaalnfm2384xp4cyx7srd9spfv"))))
-    (build-system texlive-build-system)
-    (arguments
-     '(#:tex-directory "latex/ms"
-       #:tex-format "latex"))
-    (home-page "https://ctan.org/pkg/ms";)
-    (synopsis "Various LATEX packages by Martin Schröder")
-    (description
-     "A bundle of LATEX packages by Martin Schröder; the collection comprises:
+(define-public texlive-ms
+  (let ((template
+         (simple-texlive-package
+          "texlive-ms"
+          (list "doc/latex/ms/" "source/latex/ms/" "tex/latex/ms/")
+          (base32 "1cgrpx5mybiirjjdmni8kvqdg37dwfkixq3h9ami0mgxqqqfl2x3"))))
+    (package
+      (inherit template)
+      (outputs '("out" "doc"))
+      (arguments
+       (substitute-keyword-arguments (package-arguments template)
+         ((#:tex-directory _ '())
+          "latex/ms")
+         ((#:tex-format _ "latex") "latex")
+         ((#:build-targets _ '())
+          #~(list "count1to.ins" "multitoc.ins"))
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              (add-after 'unpack 'chdir
+                (lambda _
+                  (chdir "source/latex/ms")))
+              (replace 'copy-files
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (let ((origin (assoc-ref inputs "source"))
+                        (source (string-append #$output
+                                               "/share/texmf-dist/source"))
+                        (doc (string-append #$output:doc
+                                            "/share/texmf-dist/doc")))
+                    (copy-recursively (string-append origin "/source") source)
+                    (copy-recursively (string-append origin "/doc") doc))))))))
+      (home-page "https://ctan.org/macros/latex/contrib/ms";)
+      (synopsis "Various LaTeX packages by Martin Schroder")
+      (description
+       "The remains of a bundle of LaTeX packages by Martin Schroder; the
+collection comprises: count1to, make use of TeX counters; and multitoc,
+typeset the table of contents in multiple columns.")
+      (license license:lppl))))
 
-@itemize
-@item @command{count1to}, make use of fixed TEX counters;
-@item @command{everysel}, set commands to execute every time a font is 
selected;
-@item @command{everyshi}, set commands to execute whenever a page is shipped 
out;
-@item @command{multitoc}, typeset the table of contents in multiple columns;
-@item @command{prelim2e}, mark typeset pages as preliminary; and
-@item @command{ragged2e}, typeset ragged text and allow hyphenation.
-@end itemize\n")
-    (license license:lppl1.3c+)))
+(define-deprecated-package texlive-latex-ms texlive-ms)
 
 (define-public texlive-latex-numprint
   (package