90/421: gnu: texlive-latex-overpic -> texlive-overpic.

[guix-commits]

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

commit 68fda7fb7a87c6ba0529bad08bb5e8adbacdf667
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sat May 13 16:39:53 2023 +0200

    gnu: texlive-latex-overpic -> texlive-overpic.
    
    * gnu/packages/tex.scm (texlive-overpic): New variable.
    (texlive-latex-overpic): Deprecate variable.
    * gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 39 +++++++++++++++------------------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index bc576217e5..674186a9fa 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -549,7 +549,7 @@ the in DocBook SGML DTDs.")
                                              texlive-jknapltx
                                              texlive-listings
                                              texlive-multirow
-                                             texlive-latex-overpic
+                                             texlive-overpic
                                              texlive-pdfpages
                                              texlive-refcount
                                              texlive-subfigure
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b6eea60fa4..35a954c4e5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7395,32 +7395,21 @@ advantage with @code{\\multirow} cells.")
 
 (define-deprecated-package texlive-latex-multirow texlive-multirow)
 
-(define-public texlive-latex-overpic
+(define-public texlive-overpic
   (package
-    (name "texlive-latex-overpic")
+    (name "texlive-overpic")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/overpic"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1ygsr0rsdabj61zask3346xrwiphz5i6f1nfb9k4d3234psh09kb"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/overpic")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/overpic/"
+                   "source/latex/overpic/"
+                   "tex/latex/overpic/")
+             (base32
+              "0z6jkn54b4yfk2ia8cxcb5is3qyg64r0na05ixd8xbirrks9ir7w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-eepic texlive-graphics))
     (home-page "https://www.ctan.org/pkg/overpic";)
     (synopsis "Combine LaTeX commands over included graphics")
     (description
@@ -7431,6 +7420,8 @@ the included graphic.  LaTeX commands can be placed on 
the graphic at defined
 positions; a grid for orientation is available.")
     (license license:lppl1.0+)))
 
+(define-deprecated-package texlive-latex-overpic texlive-overpic)
+
 (define-public texlive-latex-parskip
   (package
     (name "texlive-latex-parskip")