06/06: gnu: texlive-stmaryrd: Incorporate and remove replacement.

[guix-commits]

civodul pushed a commit to branch staging
in repository guix.

commit 8a340e032a9b04d2518b458c93e8569263267913
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun May 8 12:11:38 2022 +0200

    gnu: texlive-stmaryrd: Incorporate and remove replacement.
    
    * gnu/packages/tex.scm (texlive-stmaryrd)[replacement]: Remove.
    [arguments]: Add 'unchdir' and 'delete-extra-files' phases.
    (texlive-stmaryrd/fixed): Remove.
---
 gnu/packages/tex.scm | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 96449a7492..b214344667 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6229,8 +6229,6 @@ use this package to insert PostScript files, in addition 
to PDF files.")
                     "0yn0yl6x1z9ab5gb56lhvkqabd2agz3ggxifwxkiysrj5780j29z"))))
     (package
       (inherit template)
-      ;; TODO: This package is missing files.
-      (replacement texlive-stmaryrd/fixed)
       (arguments (substitute-keyword-arguments (package-arguments template)
                    ((#:tex-directory _ #t)
                     "latex/stmaryrd")
@@ -6246,7 +6244,15 @@ use this package to insert PostScript files, in addition 
to PDF files.")
                              (("^%% LaTeX2e.*") "\\input docstrip\n")
                              (("fontdef\\}\\}" line)
                               (string-append line "\n\\endbatchfile")))
-                           #t))))))
+                           #t))
+                       (add-before 'copy-files 'unchdir
+                         (lambda _
+                           (chdir "../../..")))
+                       (add-after 'copy-files 'delete-extra-files
+                         (lambda* (#:key outputs #:allow-other-keys)
+                           (delete-file-recursively
+                            (string-append (assoc-ref outputs "out")
+                                           
"/share/texmf-dist/source/fonts/stmaryrd/build"))))))))
       (home-page "https://www.ctan.org/pkg/stmaryrd";)
       (synopsis "St Mary Road symbols for theoretical computer science")
       (description
@@ -6257,25 +6263,6 @@ use under LaTeX; the package supports the @code{only} 
option (provided by the
 the whole font.")
       (license license:lppl))))
 
-(define-public texlive-stmaryrd/fixed
-  (package
-    (inherit texlive-stmaryrd)
-    (name "texlive-stmaryrd-fixed")
-    (arguments
-     (substitute-keyword-arguments (package-arguments texlive-stmaryrd)
-       ((#:tex-directory _ #t)
-        "latex/stmaryrd")
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (add-before 'copy-files 'unchdir
-             (lambda _
-               (chdir "../../..")))
-           (add-after 'copy-files 'delete-extra-files
-             (lambda* (#:key outputs #:allow-other-keys)
-               (delete-file-recursively
-                (string-append (assoc-ref outputs "out")
-                               
"/share/texmf-dist/source/fonts/stmaryrd/build"))))))))))
-
 (define-deprecated-package texlive-fonts-stmaryrd texlive-stmaryrd)
 
 (define-public texlive-latex-subfigure