From b09e968667cd7f690e4f05b088a5a515b0018899 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 17 Jul 2022 11:56:45 +0200
Subject: gnu: Avoid use of deprecated texlive packages.

* gnu/packages/cran.scm (r-prereg)[propagated-inputs]: Avoid deprecated
texlive package names.
* gnu/packages/python-xyz.scm (python-nbconvert)[native-inputs,
propagated-inputs]: Likewise.
* gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Likewise.
* gnu/packages/maths.scm (hypre)[native-inputs]: Remove redundant and
deprecated 'texlive-latex-titlesec'.
---
 gnu/packages/cran.scm       | 10 +++++-----
 gnu/packages/maths.scm      |  1 -
 gnu/packages/python-xyz.scm | 10 +++++-----
 gnu/packages/sphinx.scm     | 14 +++++++-------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 96dca393e6..cd586eab80 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -30480,13 +30480,13 @@ package online.")
             texlive-amsmath
             texlive-booktabs
             texlive-etoolbox
-            texlive-generic-iftex
-            texlive-latex-fancyhdr
-            texlive-latex-fancyvrb
+            texlive-iftex
+            texlive-fancyhdr
+            texlive-fancyvrb
             texlive-latex-geometry
-            texlive-latex-graphics
+            texlive-graphics
             texlive-latex-threeparttable
-            texlive-latex-titlesec
+            texlive-titlesec
             texlive-latex-upquote
             texlive-listings
             texlive-polyglossia
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4292ae5d1f..fde47bf488 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5553,7 +5553,6 @@ set.")
                                      texlive-latex-parskip
                                      texlive-latex-stackengine
                                      texlive-latex-tabulary
-                                     texlive-latex-titlesec
                                      texlive-latex-tocloft
                                      texlive-latex-upquote
                                      texlive-latex-varwidth
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 08986569b3..a4a090be7c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13070,8 +13070,8 @@ time.")
                           texlive-hyperref
                           texlive-iftex
                           texlive-jknappen
-                          texlive-latex-amsmath
-                          texlive-latex-enumitem
+                          texlive-amsmath
+                          texlive-enumitem
                           texlive-latex-float
                           texlive-latex-geometry
                           texlive-latex-jknapltx
@@ -13113,14 +13113,14 @@ time.")
            texlive-caption
            texlive-enumitem
            texlive-fontspec
-           texlive-generic-iftex
+           texlive-iftex
            texlive-grffile
            texlive-hyperref
-           texlive-latex-fancyvrb
+           texlive-fancyvrb
            texlive-latex-float
            texlive-latex-geometry
            texlive-latex-jknapltx
-           texlive-latex-ms
+           texlive-ms
            texlive-latex-parskip
            texlive-latex-trimspaces
            texlive-latex-upquote
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index bbb070ddf6..14f70a56f5 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -109,7 +109,7 @@
            texlive-capt-of
            texlive-carlisle             ;remreset
            texlive-etoolbox
-           texlive-generic-ltxcmds
+           texlive-ltxcmds
            texlive-hyperref
            ;; TODO: Remove texlive-stringenc and texlive-zapfding after
            ;; propagating them in texlive-hyperref in next rebuild cycle.
@@ -117,20 +117,20 @@
            texlive-zapfding
            texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
            texlive-latex-cmap
-           texlive-latex-fancyhdr
-           texlive-latex-fancyvrb
+           texlive-fancyhdr
+           texlive-fancyvrb
            texlive-latex-float
            texlive-latex-fncychap
            texlive-latex-framed
            texlive-latex-geometry
-           texlive-latex-graphics       ;graphicx, color
-           texlive-latex-kvoptions
+           texlive-graphics                       ;graphicx, color
+           texlive-kvoptions
            texlive-latex-needspace
            texlive-latex-parskip
            texlive-latex-preview
            texlive-latex-tabulary
-           texlive-latex-titlesec
-           texlive-latex-tools          ;multicol, longtable
+           texlive-titlesec
+           texlive-tools                          ;multicol, longtable
            texlive-latex-upquote
            texlive-latex-varwidth
            texlive-oberdiek             ;hypcap
-- 
cgit 1.4.1