gnu: texlive-latex-geometry -> texlive-geometry.

* gnu/packages/tex.scm (texlive-geometry): New variable.
(texlive-latex-geometry): Deprecate variable.
(texlive-xindy):
* gnu/packages/chemistry.scm (yaehmop):
* gnu/packages/cran.scm (r-prereg):
* gnu/packages/graphviz.scm (dot2tex):
* gnu/packages/maths.scm (hypre):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/python-xyz.scm (python-nbconvert):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.

gnu/packages/chemistry.scm

@@ -899,9 +899,10 @@ (define-public yaehmop
     (inputs (list openblas))
     (native-inputs
      (list gfortran
-           (texlive-updmap.cfg (list texlive-fonts-ec
+           (texlive-updmap.cfg
-                                     texlive-graphics
+            (list texlive-fonts-ec
-                                     texlive-latex-geometry))))
+                  texlive-geometry
+                  texlive-graphics))))
     (home-page "https://github.com/greglandrum/yaehmop")
     (synopsis "Perform extended Hückel calculations")
     (description "@acronym{YAeHMOP, Yet Another extended Hueckel Molecular

gnu/packages/cran.scm

@@ -36197,7 +36197,7 @@ (define-public r-prereg
             texlive-iftex
             texlive-fancyhdr
             texlive-fancyvrb
-            texlive-latex-geometry
+            texlive-geometry
             texlive-graphics
             texlive-latex-threeparttable
             texlive-titlesec

gnu/packages/graphviz.scm

@@ -387,8 +387,8 @@ (define-public dot2tex
            ;; the resulting generated TeX files, which \usepackage them.
            texlive-bin
            texlive-amsmath
+           texlive-geometry
            texlive-graphics
-           texlive-latex-geometry
            texlive-latex-base
            texlive-latex-preview
            texlive-latex-xkeyval

gnu/packages/maths.scm

@@ -5803,7 +5803,7 @@ (define-public hypre
                                      texlive-latex-float
                                      texlive-fncychap
                                      texlive-framed
-                                     texlive-latex-geometry
+                                     texlive-geometry
                                      texlive-hanging
                                      texlive-hyperref
                                      texlive-latex-multirow

gnu/packages/plotutils.scm

@@ -311,7 +311,7 @@ (define-public asymptote
                   texlive-epsf
                   texlive-etoolbox
                   texlive-fonts-ec
-                  texlive-latex-geometry
+                  texlive-geometry
                   texlive-graphics
                   texlive-grfext
                   texlive-hyperref

gnu/packages/python-xyz.scm

@@ -15187,7 +15187,7 @@ (define-public python-nbconvert
            texlive-hyperref
            texlive-fancyvrb
            texlive-latex-float
-           texlive-latex-geometry
+           texlive-geometry
            texlive-latex-jknapltx
            texlive-ms
            texlive-latex-parskip

gnu/packages/sphinx.scm

@@ -119,7 +119,7 @@ (define-public python-sphinx
            texlive-latex-float
            texlive-fncychap
            texlive-framed
-           texlive-latex-geometry
+           texlive-geometry
            texlive-graphics                       ;graphicx, color
            texlive-kvoptions
            texlive-latex-needspace

gnu/packages/tex.scm

@@ -6017,22 +6017,23 @@ (define-public texlive-gcite
 
 (define-deprecated-package texlive-latex-gcite texlive-gcite)
 
-(define-public texlive-latex-geometry
+(define-public texlive-geometry
   (package
-    (name "texlive-latex-geometry")
+    (name "texlive-geometry")
     (version (number->string %texlive-revision))
-    (source (origin
+    (source (texlive-origin
-              (method svn-fetch)
+             name version
-              (uri (texlive-ref "latex" "geometry"))
+             (list "doc/latex/geometry/"
-              (file-name (string-append name "-" version "-checkout"))
+                   "source/latex/geometry/"
-              (sha256
+                   "tex/latex/geometry/")
              (base32
-                "0a9nrmiwksnpa6iaapirqid974ai56qgin2n4h9mggy9v8gp7r71"))))
+              "09jwdrg4s1c0gqmx7s57byw5kc09cna3li85y9ix0vxa6f6iqzi1")))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/geometry"))
+    (outputs '("out" "doc"))
     (propagated-inputs
-     (list texlive-oberdiek             ;for ifpdf
+     (list texlive-atbegshi
-           texlive-graphics))           ;for keyval
+           texlive-graphics             ;for keyval
+           texlive-iftex))
     (home-page "https://www.ctan.org/pkg/geometry")
     (synopsis "Flexible and complete interface to document dimensions")
     (description
@@ -6040,11 +6041,13 @@ (define-public texlive-latex-geometry
 page layout, implementing auto-centering and auto-balancing mechanisms so that
 the users have only to give the least description for the page layout.  The
 package knows about all the standard paper sizes, so that the user need not
-know what the nominal \"real\" dimensions of the paper are, just its standard
+know what the nominal real dimensions of the paper are, just its standard
 name (such as a4, letter, etc.).  An important feature is the package's
 ability to communicate the paper size it's set up to the output.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-geometry texlive-geometry)
+
 (define-public texlive-latex-mdwtools
   (package
     (name "texlive-latex-mdwtools")
@@ -11730,7 +11733,7 @@ (define-public texlive-xindy
                          texlive-hyperref
                          texlive-latex-base
                          texlive-cyrillic
-                         texlive-latex-geometry
+                         texlive-geometry
                          (texlive-updmap.cfg ;fonts
                           (list texlive-cbfonts
                                 texlive-lh