Add dependency changes to R packages (#36937)

This PR adds dependency changes that were missed with some recent merges
of R package updates.

9 files changed, 22 insertions, 11 deletions

diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py
index 2ebd9899e5..395c0acd20 100644
--- a/var/spack/repos/builtin/packages/r-hms/package.py
+++ b/var/spack/repos/builtin/packages/r-hms/package.py
@@ -21,12 +21,13 @@ class RHms(RPackage):
     version("0.5.0", sha256="a87872665c3bf3901f597d78c152e7805f7129e4dbe27397051de4cf1a76561b")
     version("0.3", sha256="9368259cbc1094ce0e4cf61544875ec30088ef690d6667e6b0b564218ab3ff88")
 
-    depends_on("r-ellipsis", type=("build", "run"), when="@1.0.0:")
-    depends_on("r-ellipsis@0.3.2", type=("build", "run"), when="@1.1:")
-    depends_on("r-ellipsis@0.3.2:", type=("build", "run"), when="@1.1.2:")
     depends_on("r-lifecycle", type=("build", "run"), when="@1.0.0:")
     depends_on("r-pkgconfig", type=("build", "run"), when="@0.5.0:")
     depends_on("r-rlang", type=("build", "run"), when="@0.5.0:")
+    depends_on("r-rlang@1.0.2:", type=("build", "run"), when="@1.1.3:")
     depends_on("r-vctrs@0.2.0:", type=("build", "run"), when="@0.5.0:")
     depends_on("r-vctrs@0.2.1:", type=("build", "run"), when="@1.0.0:")
     depends_on("r-vctrs@0.3.8:", type=("build", "run"), when="@1.1:")
+    depends_on("r-ellipsis", type=("build", "run"), when="@1.0.0:1.1.2")
+    depends_on("r-ellipsis@0.3.2", type=("build", "run"), when="@1.1:1.1.2")
+    depends_on("r-ellipsis@0.3.2:", type=("build", "run"), when="@1.1.2:1.1.2")
diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py
index 6d96b620d3..4051533b2b 100644
--- a/var/spack/repos/builtin/packages/r-httr/package.py
+++ b/var/spack/repos/builtin/packages/r-httr/package.py
@@ -28,6 +28,7 @@ class RHttr(RPackage):
     depends_on("r@3.0.0:", type=("build", "run"))
     depends_on("r@3.1:", type=("build", "run"), when="@1.4.0:")
     depends_on("r@3.2:", type=("build", "run"), when="@1.4.1:")
+    depends_on("r@3.5:", type=("build", "run"), when="@1.4.5:")
     depends_on("r-curl@3.0.0:", type=("build", "run"))
     depends_on("r-jsonlite", type=("build", "run"))
     depends_on("r-mime", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py
index a843898921..3da9a9f1ff 100644
--- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py
+++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py
@@ -32,11 +32,13 @@ class RPbkrtest(RPackage):
     depends_on("r@3.0.2:", type=("build", "run"))
     depends_on("r@3.2.3:", type=("build", "run"), when="@0.4-6:")
     depends_on("r@3.5.0:", type=("build", "run"), when="@0.5-0.1:")
+    depends_on("r@4.1.0:", type=("build", "run"), when="@0.5.2:")
     depends_on("r-lme4@1.1-10:", type=("build", "run"))
+    depends_on("r-lme4@1.1.31:", type=("build", "run"), when="@0.5.2:")
     depends_on("r-broom", type=("build", "run"), when="@0.5-0.1:")
     depends_on("r-dplyr", type=("build", "run"), when="@0.5-0.1:")
-    depends_on("r-magrittr", type=("build", "run"), when="@0.5-0.1:")
     depends_on("r-mass", type=("build", "run"))
     depends_on("r-matrix@1.2.3:", type=("build", "run"))
     depends_on("r-numderiv", type=("build", "run"), when="@0.5-0.1:")
-    depends_on("r-knitr", type=("build", "run"), when="@0.5-0.1:")
+    depends_on("r-knitr", type=("build", "run"), when="@0.5-0.1:0.5.1")
+    depends_on("r-magrittr", type=("build", "run"), when="@0.5-0.1:0.5.1")
diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py
index 202c4fd10e..40120150b0 100644
--- a/var/spack/repos/builtin/packages/r-rlang/package.py
+++ b/var/spack/repos/builtin/packages/r-rlang/package.py
@@ -36,3 +36,4 @@ class RRlang(RPackage):
     depends_on("r@3.2.0:", type=("build", "run"), when="@0.4.0:")
     depends_on("r@3.3.0:", type=("build", "run"), when="@0.4.10:")
     depends_on("r@3.4.0:", type=("build", "run"), when="@1.0.2:")
+    depends_on("r@3.5.0:", type=("build", "run"), when="@1.1.0:")
diff --git a/var/spack/repos/builtin/packages/r-rrblup/package.py b/var/spack/repos/builtin/packages/r-rrblup/package.py
index db5a54287f..0ab0e2fb2e 100644
--- a/var/spack/repos/builtin/packages/r-rrblup/package.py
+++ b/var/spack/repos/builtin/packages/r-rrblup/package.py
@@ -22,3 +22,4 @@ class RRrblup(RPackage):
     version("4.6", sha256="28b475a1466fcdc1780caace75cf34155338fda496cebd5799315598a4bc84af")
 
     depends_on("r@2.14:", type=("build", "run"))
+    depends_on("r@4.0:", type=("build", "run"), when="@4.6.2:")
diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py
index b6907b0485..136a602de7 100644
--- a/var/spack/repos/builtin/packages/r-tibble/package.py
+++ b/var/spack/repos/builtin/packages/r-tibble/package.py
@@ -31,6 +31,7 @@ class RTibble(RPackage):
 
     depends_on("r@3.1.2:", type=("build", "run"))
     depends_on("r@3.1.0:", type=("build", "run"), when="@1.3.0:")
+    depends_on("r@3.4.0:", type=("build", "run"), when="@3.2.1:")
     depends_on("r-fansi@0.4.0:", type=("build", "run"), when="@2.0.0:")
     depends_on("r-lifecycle@0.2.0:", type=("build", "run"), when="@3.0.5:")
     depends_on("r-lifecycle@1.0.0:", type=("build", "run"), when="@3.1.5:")
@@ -40,6 +41,7 @@ class RTibble(RPackage):
     depends_on("r-pillar@1.6.0:", type=("build", "run"), when="@3.1.0:")
     depends_on("r-pillar@1.6.2:", type=("build", "run"), when="@3.1.4:")
     depends_on("r-pillar@1.7.0:", type=("build", "run"), when="@3.1.7:")
+    depends_on("r-pillar@1.8.1:", type=("build", "run"), when="@3.2.1:")
     depends_on("r-pkgconfig", type=("build", "run"), when="@2.0.0:")
     depends_on("r-rlang@0.3.0:", type=("build", "run"), when="@1.3.1:")
     depends_on("r-rlang@0.4.3:", type=("build", "run"), when="@3.0.5:")
@@ -47,12 +49,12 @@ class RTibble(RPackage):
     depends_on("r-rlang@1.0.2:", type=("build", "run"), when="@3.1.8:")
     depends_on("r-vctrs@0.3.2:", type=("build", "run"), when="@3.0.5:")
     depends_on("r-vctrs@0.3.8:", type=("build", "run"), when="@3.1.2:")
+    depends_on("r-vctrs@0.4.2:", type=("build", "run"), when="@3.2.1:")
 
     depends_on("r-cli", type=("build", "run"), when="@1.4.2:3.0")
     depends_on("r-crayon@1.3.4:", type=("build", "run"), when="@1.4.1:3.0")
     depends_on("r-assertthat", type=("build", "run"), when="@:1.3.1")
     depends_on("r-lazyeval@0.1.10:", type=("build", "run"), when="@:1.3.0")
     depends_on("r-rcpp@0.12.3:", type=("build", "run"), when="@:1.3.4")
-    depends_on("r-ellipsis@0.2.0:", type=("build", "run"), when="@3.0.5:")
-    depends_on("r-ellipsis@0.3.2:", type=("build", "run"), when="@3.1.2:")
-    depends_on("r-ellipsis", when="@:3.1.7")
+    depends_on("r-ellipsis@0.2.0:", type=("build", "run"), when="@3.0.5:3.1.7")
+    depends_on("r-ellipsis@0.3.2:", type=("build", "run"), when="@3.1.2:3.1.7")
diff --git a/var/spack/repos/builtin/packages/r-tidytree/package.py b/var/spack/repos/builtin/packages/r-tidytree/package.py
index 13a84993a2..11128ff264 100644
--- a/var/spack/repos/builtin/packages/r-tidytree/package.py
+++ b/var/spack/repos/builtin/packages/r-tidytree/package.py
@@ -32,3 +32,4 @@ class RTidytree(RPackage):
     depends_on("r-tidyselect", type=("build", "run"))
     depends_on("r-yulab-utils@0.0.4:", type=("build", "run"))
     depends_on("r-pillar", type=("build", "run"), when="@0.3.9:")
+    depends_on("r-cli", type=("build", "run"), when="@0.4.2:")
diff --git a/var/spack/repos/builtin/packages/r-tigris/package.py b/var/spack/repos/builtin/packages/r-tigris/package.py
index 600cb20cf1..d8360cb1e2 100644
--- a/var/spack/repos/builtin/packages/r-tigris/package.py
+++ b/var/spack/repos/builtin/packages/r-tigris/package.py
@@ -26,13 +26,13 @@ class RTigris(RPackage):
     depends_on("r@3.3.0:", type=("build", "run"), when="@0.6.1:")
     depends_on("r-stringr", type=("build", "run"))
     depends_on("r-magrittr", type=("build", "run"))
-    depends_on("r-rgdal", type=("build", "run"))
-    depends_on("r-sp", type=("build", "run"))
     depends_on("r-rappdirs", type=("build", "run"))
-    depends_on("r-maptools", type=("build", "run"))
     depends_on("r-httr", type=("build", "run"))
     depends_on("r-uuid", type=("build", "run"))
     depends_on("r-sf", type=("build", "run"))
     depends_on("r-dplyr", type=("build", "run"))
 
     depends_on("r-rgeos", type=("build", "run"), when="@:0.5.3")
+    depends_on("r-maptools", type=("build", "run"), when="@:1.6.1")
+    depends_on("r-rgdal", type=("build", "run"), when="@:1.6.1")
+    depends_on("r-sp", type=("build", "run"), when="@:1.6.1")
diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py
index 0aab6022cc..431b3ba385 100644
--- a/var/spack/repos/builtin/packages/r-xts/package.py
+++ b/var/spack/repos/builtin/packages/r-xts/package.py
@@ -22,4 +22,6 @@ class RXts(RPackage):
     version("0.11-2", sha256="12772f6a66aab5b84b0665c470f11a3d8d8a992955c027261cfe8e6077ee13b8")
     version("0.9-7", sha256="f11f7cb98f4b92b7f6632a2151257914130880c267736ef5a264b5dc2dfb7098")
 
+    depends_on("r@3.6.0:", type=("build", "run"), when="@0.13.0:")
+
     depends_on("r-zoo@1.7-12:", type=("build", "run"))