194/421: gnu: texlive-utopia: Refresh package definition.

[guix-commits]

ngz pushed a commit to branch tex-team-next
in repository guix.

commit 34819dd95c1212360446962f203044c44052692e
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Mon May 15 18:58:38 2023 +0200

    gnu: texlive-utopia: Refresh package definition.
    
    * gnu/packages/tex.scm (texlive-utopia): Remove SIMPLE-TEXLIVE-PACKAGE
    call.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a34fce60b4..5e3f6c1111 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11198,23 +11198,25 @@ trademark of Adobe Systems Incorporated.")
 
 (define-public texlive-utopia
   (package
-    (inherit (simple-texlive-package
-              "texlive-utopia"
-              (list "/doc/fonts/utopia/"
-                    "/fonts/afm/adobe/utopia/"
-                    "/fonts/tfm/adobe/utopia/"
-                    "/fonts/type1/adobe/utopia/"
-                    "/fonts/vf/adobe/utopia/")
-              (base32
-               "113wgkfz4z0ls2grxxfj17l42a1yv9r5ipcd0156xnfsrqvqzxfc")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/utopia";)
+    (name "texlive-utopia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/utopia/" "fonts/afm/adobe/utopia/"
+                   "fonts/tfm/adobe/utopia/"
+                   "fonts/type1/adobe/utopia/"
+                   "fonts/vf/adobe/utopia/")
+             (base32
+              "113wgkfz4z0ls2grxxfj17l42a1yv9r5ipcd0156xnfsrqvqzxfc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/utopia";)
     (synopsis "Adobe Utopia fonts")
-    (description "The Adobe Standard Encoding set of the Utopia font
-family, as contributed to the X Consortium.  The set comprises upright
-and italic shapes in medium and bold weights.  Macro support and
-matching maths fonts are provided by the @code{fourier} and
-@code{mathdesign} font packages.")
+    (description
+     "The Adobe Standard Encoding set of the Utopia font family, as
+contributed by the X Consortium.  The set comprises upright and italic shapes
+in medium and bold weights.  Macro support and matching maths fonts are
+provided by the @code{fourier} and the @code{mathdesign} font packages.")
     (license (license:fsf-free
               "http://mirrors.ctan.org/fonts/utopia/README";))))