gnu: texlive-latex-subfigure: Rename to texlive-subfigure.

* gnu/packages/tex.scm (texlive-subfigure): New variable.
(texlive-latex-subfigure): Deprecated alias.
* gnu/packages/docbook.scm (dblatex): Use new name.

gnu/packages/docbook.scm

@@ -478,7 +478,7 @@ the in DocBook SGML DTDs.")
                                         texlive-latex-overpic
                                         texlive-latex-pdfpages
                                         texlive-refcount
-                                        texlive-latex-subfigure
+                                        texlive-subfigure
                                         texlive-latex-titlesec
                                         texlive-wasysym
 

gnu/packages/tex.scm

@@ -6591,19 +6591,37 @@ the whole font.")
 
 (define-deprecated-package texlive-fonts-stmaryrd texlive-stmaryrd)
 
-(define-public texlive-latex-subfigure
+(define-public texlive-subfigure
-  (package
+  (let ((template (simple-texlive-package
-    (name "texlive-latex-subfigure")
+                   "texlive-subfigure"
-    (version (number->string %texlive-revision))
+                   (list "doc/latex/subfigure/"
-    (source (origin
+                         "source/latex/subfigure/"
-              (method svn-fetch)
+                         "tex/latex/subfigure/")
-              (uri (texlive-ref "latex" "subfigure"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
                    (base32
-                "15spcl5wb7w269qd6y596vp4yi8sa5ppcx8w4z2i9kyp02r3a0yb"))))
+                    "1327ygajf6gza5msvhfjjnk6r3sw7vb7rxg23v4gx4dmyxqfqrbi"))))
-    (build-system texlive-build-system)
+    (package
-    (arguments '(#:tex-directory "latex/subfigure"))
+      (inherit template)
+      (outputs '("out" "doc"))
+      (arguments
+       (substitute-keyword-arguments (package-arguments template)
+         ((#:tex-directory _ '())
+          "latex/subfigure")
+         ((#:build-targets _ '())
+          #~(list "subfigure.ins"))
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              (add-after 'unpack 'chdir
+                (lambda _
+                  (chdir "source/latex/subfigure")))
+              (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://www.ctan.org/pkg/subfigure")
       (synopsis "Figures divided into subfigures")
       (description
@@ -6616,7 +6634,9 @@ used inside a figure environment for each subfigure.  An optional first
 argument is used as the caption for that subfigure.  The package is now
 considered obsolete: it was superseded by @code{subfig}, but users may find
 the more recent @code{subcaption} package more satisfactory.")
-    (license license:lppl)))
+      (license license:lppl))))
+
+(define-deprecated-package texlive-latex-subfigure texlive-subfigure)
 
 (define-public texlive-latex-tabulary
   (package