gnu: Add texlive-cm.

* gnu/packages/tex.scm (texlive-cm): New variable.
(texlive-fonts-cm): Deprecate package.

gnu/packages/tex.scm

@@ -699,27 +699,25 @@ from (almost) arbitrarily complex font names, thus helping portability of TeX
 documents.")
     (license license:public-domain)))
 
-(define-public texlive-fonts-cm
-  (package
-    (inherit (simple-texlive-package
-              "texlive-fonts-cm"
+(define-public texlive-cm
+  (let ((template (simple-texlive-package
+                   "texlive-cm"
                    (list "/fonts/source/public/cm/"
                          "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map"
-                    "/doc/fonts/cm/README"
-                    "/doc/fonts/cm/README-cmps.txt")
+                         "/doc/fonts/cm/")
                    (base32
-               "1h0q71paqmg1xjg6k35ni2i6m93kmlq9rdwm913xg9n4qngywl18")))
-    (outputs '("out" "doc"))
-    (build-system gnu-build-system)
+                    "1h0q71paqmg1xjg6k35ni2i6m93kmlq9rdwm913xg9n4qngywl18")
+                   #:trivial? #t)))
+    (package
+      (inherit template)
       (arguments
-     `(#:modules ((guix build gnu-build-system)
+       (substitute-keyword-arguments (package-arguments template)
+         ((#:modules modules '())
+          '((guix build gnu-build-system)
             (guix build utils)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:tests? #f ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
+            (srfi srfi-26)))
+         ((#:phases phases)
+          `(modify-phases ,phases
              (replace 'build
                (lambda* (#:key inputs #:allow-other-keys)
                  (let ((mf (assoc-ref inputs "texlive-metafont-base")))
@@ -754,27 +752,16 @@ documents.")
                                                         (basename font ".mf") ".pk")))
                                (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$"))))
                  #t))
-         (replace 'install
+             (add-after 'install 'install-generated-fonts
                (lambda* (#:key inputs outputs #:allow-other-keys)
                  (let* ((out    (assoc-ref outputs "out"))
-                    (doc    (assoc-ref outputs "doc"))
-                    (source (assoc-ref inputs "source"))
                         (fonts  (string-append out "/share/texmf-dist/fonts/"))
                         (pk     (string-append fonts "pk"))
-                    (tfm    (string-append fonts "tfm/public/cm"))
-                    (mf     (string-append fonts "source/public/cm")))
+                        (tfm    (string-append fonts "tfm/public/cm")))
                    (for-each (cut install-file <> tfm)
                              (find-files "build" "\\.*"))
-               (for-each (cut install-file <> mf)
-                         (find-files "." "\\.mf"))
                    (copy-recursively "pk" pk)
-               (copy-recursively
-                (string-append source "/doc")
-                (string-append doc "/doc"))
-               (install-file
-                (string-append source "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map")
-                (string-append fonts "/map/dvips/cm/cmtext-bsr-interpolated.map"))
-               #t))))))
+                   #t)))))))
       (native-inputs
        `(("texlive-bin" ,texlive-bin)
          ("texlive-metafont-base" ,texlive-metafont-base)))
@@ -784,7 +771,10 @@ documents.")
 Knuth.  The Computer Modern font family is a large collection of text,
 display, and mathematical fonts in a range of styles, based on Monotype Modern
 8A.")
-    (license license:knuth)))
+      (license license:knuth))))
+
+(define-public texlive-fonts-cm
+  (deprecated-package "texlive-fonts-cm" texlive-cm))
 
 (define-public texlive-cm-super
   (let ((template (simple-texlive-package