From 3476b7438696d81a6d83b4b07362d34eb1b6e981 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:34:46 +0200
Subject: [PATCH] gnu: texlive-latex-environ -> texlive-environ.

* gnu/packages/tex.scm (texlive-environ): New variable.
(texlive-latex-environ): Deprecate variable.
(texlive-tcolorbox): Apply renaming.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e18c618f47..acbc8b7e77 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4878,21 +4878,22 @@ (define-public texlive-draftwatermark
 on @code{everypage}.")
     (license license:lppl1.3+)))
 
-(define-public texlive-latex-environ
+(define-public texlive-environ
   (package
-    (name "texlive-latex-environ")
+    (name "texlive-environ")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "environ"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "06h28b26dyjkj9shksphgqfv4130jfkwhbw737hxn7d3yvdfffyd"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/environ/"
+                   "source/latex/environ/"
+                   "tex/latex/environ/")
+             (base32
+              "08a3vhyzc647b9zp3yifdklj0vch9cv2vajh7ig3y01jcdqhjy41")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/environ"))
-    (home-page "https://www.ctan.org/pkg/environ")
-    (synopsis "New interface for environments in LaTeX")
+    (propagated-inputs (list texlive-trimspaces))
+    (home-page "https://ctan.org/pkg/environ")
+    (synopsis "A new interface for environments in LaTeX")
     (description
      "This package provides the @code{\\collect@@body} command (as in
 @code{amsmath}), as well as a @code{\\long} version @code{\\Collect@@Body},
@@ -4900,6 +4901,8 @@ (define-public texlive-latex-environ
 define a new author interface to creating new environments.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-environ texlive-environ)
+
 (define-public texlive-latex-eqparbox
   (package
     (name "texlive-latex-eqparbox")
@@ -11001,7 +11004,7 @@ (define-public texlive-tcolorbox
     (package
       (inherit template)
       (propagated-inputs
-       (list texlive-etoolbox texlive-latex-environ texlive-pgf texlive-tools))
+       (list texlive-etoolbox texlive-environ texlive-pgf texlive-tools))
       (home-page "https://www.ctan.org/pkg/tcolorbox")
       (synopsis "Colored boxes, for LaTeX examples and theorems, etc")
       (description "This package provides an environment for colored and