Pull R list_urls from upstream.

tgamblin · tgamblin · commit 880e319cf6a4 · 2018-01-19T13:28:26.000-08:00
diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py
@@ -32,6 +32,6 @@ class RDbi(RPackage):
 
     homepage = "http://rstats-db.github.io/DBI"
     url      = "https://cran.rstudio.com/src/contrib/DBI_0.7.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/DBI"
     version('0.4-1', 'c7ee8f1c5037c2284e99c62698d0f087')
     version('0.7', '66065dd687d758b72d638adb6a8cab2e')
diff --git a/var/spack/repos/builtin/packages/r-dorng/package.py b/var/spack/repos/builtin/packages/r-dorng/package.py
@@ -36,7 +36,7 @@ class RDorng(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/doRNG/index.html"
     url      = "https://cran.rstudio.com/src/contrib/doRNG_1.6.6.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/doRNG"
 
     version('1.6.6', 'ffb26024c58c8c99229470293fbf35cf')
 
diff --git a/var/spack/repos/builtin/packages/r-downloader/package.py b/var/spack/repos/builtin/packages/r-downloader/package.py
@@ -35,7 +35,7 @@ class RDownloader(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/downloader/index.html"
     url      = "https://cran.rstudio.com/src/contrib/downloader_0.4.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/downloader"
 
     version('0.4', 'f26daf8fbeb29a1882bf102f62008594')
 
diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py
@@ -31,7 +31,7 @@ class RDplyr(RPackage):
 
     homepage = "https://github.com/hadley/dplyr"
     url      = "https://cran.rstudio.com/src/contrib/dplyr_0.7.3.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/dplyr"
 
     version('0.7.3', 'f9760b796917747e9dcd927ebb531c7d')
     version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef')
diff --git a/var/spack/repos/builtin/packages/r-futile-logger/package.py b/var/spack/repos/builtin/packages/r-futile-logger/package.py
@@ -32,7 +32,7 @@ class RFutileLogger(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/futile.logger/index.html"
     url      = "https://cran.rstudio.com/src/contrib/futile.logger_1.4.3.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/futile.logger"
 
     version('1.4.3', 'ba0e8d2dfb5a970b51c21907bbf8bfc2')
 
diff --git a/var/spack/repos/builtin/packages/r-getoptlong/package.py b/var/spack/repos/builtin/packages/r-getoptlong/package.py
@@ -33,7 +33,7 @@ class RGetoptlong(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/GetoptLong/index.html"
     url      = "https://cran.rstudio.com/src/contrib/GetoptLong_0.1.6.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/GetoptLong"
 
     version('0.1.6', 'e4b964d0817cb6c6a707297b21405749')
 
diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py
@@ -32,7 +32,7 @@ class RGgvis(RPackage):
 
     homepage = "http://ggvis.rstudio.com/"
     url      = "https://cran.rstudio.com/src/contrib/ggvis_0.4.3.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/ggvis"
 
     version('0.4.3', '30297d464278a7974fb125bcc7d84e77')
     version('0.4.2', '039f45e5c7f1e0652779163d7d99f922')
diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py
@@ -35,7 +35,7 @@ class RGlmnet(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/glmnet/index.html"
     url      = "https://cran.rstudio.com/src/contrib/glmnet_2.0-13.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/glmnet"
     version('2.0-13', '1dd5636388df5c3a29207d0bf1253343')
     version('2.0-5', '049b18caa29529614cd684db3beaec2a')
 
diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py
@@ -31,5 +31,6 @@ class RHms(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/hms/index.html"
     url      = "https://cran.rstudio.com/src/contrib/hms_0.3.tar.gz"
+    list_url = "https://cran.r-project.org/src/contrib/Archive/hms"
 
     version('0.3', '92c4a0cf0c402a35145b5bb57212873e')
diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py
@@ -30,7 +30,7 @@ class RHtmltools(RPackage):
 
     homepage = "https://github.com/rstudio/htmltools"
     url      = "https://cran.rstudio.com/src/contrib/htmltools_0.3.6.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/htmltools"
 
     version('0.3.6', '336419c2143f958862e01ef1bbc9c253')
     version('0.3.5', '5f001aff4a39e329f7342dcec5139724')
diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py
@@ -36,7 +36,7 @@ class RHttpuv(RPackage):
 
     homepage = "https://github.com/rstudio/httpuv"
     url      = "https://cran.rstudio.com/src/contrib/httpuv_1.3.5.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/httpuv"
 
     version('1.3.5', '48d894ff0067148f41a651634fbb2012')
     version('1.3.3', 'c78ae068cf59e949b9791be987bb4489')
diff --git a/var/spack/repos/builtin/packages/r-hwriter/package.py b/var/spack/repos/builtin/packages/r-hwriter/package.py
@@ -31,5 +31,5 @@ class RHwriter(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/hwriter/index.html"
     url      = "https://cran.rstudio.com/src/contrib/hwriter_1.3.2.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/hwriter"
     version('1.3.2', '9eef49df2eb68bbf3a16b5860d933517')
diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py
@@ -39,7 +39,7 @@ class RJsonlite(RPackage):
 
     homepage = "https://github.com/jeroenooms/jsonlite"
     url      = "https://cran.rstudio.com/src/contrib/jsonlite_1.5.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/jsonlite"
 
     version('1.5', '2a81c261a702fccbbd5d2b32df108f76')
     version('1.2', '80cd2678ae77254be470f5931db71c51')
diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py
@@ -33,7 +33,7 @@ class RLattice(RPackage):
 
     homepage = "http://lattice.r-forge.r-project.org/"
     url      = "https://cran.rstudio.com/src/contrib/lattice_0.20-35.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/lattice"
 
     version('0.20-35', '07f1814623b3da6278ca61554ff7bfe6')
     version('0.20-34', 'c2a648b22d4206ae7526fb70b8e90fed')
diff --git a/var/spack/repos/builtin/packages/r-locfit/package.py b/var/spack/repos/builtin/packages/r-locfit/package.py
@@ -30,7 +30,7 @@ class RLocfit(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/locfit/index.html"
     url      = "https://cran.rstudio.com/src/contrib/locfit_1.5-9.1.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/locfit"
 
     version('1.5-9.1', '38af7791c9cda78e2804020e65ac7fb4')
 
diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py
@@ -31,7 +31,7 @@ class RMatrix(RPackage):
 
     homepage = "http://matrix.r-forge.r-project.org/"
     url      = "https://cran.rstudio.com/src/contrib/Matrix_1.2-11.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/Matrix"
     version('1.2-11', 'a8c1a893f36d7ea918ddbf8cb8d10b43')
     version('1.2-8', '4a6406666bf97d3ec6b698eea5d9c0f5')
     version('1.2-6', 'f545307fb1284861e9266c4e9712c55e')
diff --git a/var/spack/repos/builtin/packages/r-matrixstats/package.py b/var/spack/repos/builtin/packages/r-matrixstats/package.py
@@ -35,6 +35,6 @@ class RMatrixstats(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/matrixStats/index.html"
     url      = "https://cran.rstudio.com/src/contrib/matrixStats_0.52.2.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/matrixStats"
 
     version('0.52.2', '41b987d3ae96ee6895875c413adcba3c')
diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py
@@ -31,7 +31,7 @@ class RMemoise(RPackage):
 
     homepage = "https://github.com/hadley/memoise"
     url      = "https://cran.rstudio.com/src/contrib/memoise_1.1.0.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/memoise"
     version('1.1.0', '493209ee04673f0fcab473c3dd80fb8c')
     version('1.0.0', 'd31145292e2a88ae9a504cab1602e4ac')
 
diff --git a/var/spack/repos/builtin/packages/r-mpm/package.py b/var/spack/repos/builtin/packages/r-mpm/package.py
@@ -32,7 +32,7 @@ class RMpm(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/mpm/index.html"
     url = "https://cran.rstudio.com/src/contrib/mpm_1.0-22.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/mpm"
     version('1.0-22', '91885c421cafd89ce8893ccf827165a2')
 
     depends_on('r-kernsmooth', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-nor1mix/package.py b/var/spack/repos/builtin/packages/r-nor1mix/package.py
@@ -34,6 +34,6 @@ class RNor1mix(RPackage):
 
     homepage = "https://CRAN.R-project.org/package=nor1mix"
     url      = "https://cran.rstudio.com/src/contrib/nor1mix_1.2-3.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/nor1mix"
 
     version('1.2-3', '60eb5cc1ea6b366f53042087a080b105')
diff --git a/var/spack/repos/builtin/packages/r-pkgconfig/package.py b/var/spack/repos/builtin/packages/r-pkgconfig/package.py
@@ -32,5 +32,5 @@ class RPkgconfig(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/pkgconfig/index.html"
     url      = "https://cran.rstudio.com/src/contrib/pkgconfig_2.0.1.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/pkgconfig"
     version('2.0.1', 'a20fd9588e37995995fa62dc4828002e')
diff --git a/var/spack/repos/builtin/packages/r-r6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py
@@ -35,7 +35,7 @@ class RR6(RPackage):
 
     homepage = "https://github.com/wch/R6/"
     url      = "https://cran.rstudio.com/src/contrib/R6_2.2.2.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/R6"
 
     version('2.2.2', '635b58c65bff624a1fab69c6b1989801')
     version('2.2.0', '659d83b2d3f7a308a48332b4cfbdab49')
diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py
@@ -38,8 +38,9 @@ class RRcpp(RPackage):
 
     homepage = "http://dirk.eddelbuettel.com/code/rcpp.html"
     url      = "https://cran.rstudio.com/src/contrib/Rcpp_0.12.13.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.rstudio.com/src/contrib/Archive/Rcpp"
 
+    version('0.12.14', '89a3dbad0aa3e345b9d0b862fa1fc56a')
     version('0.12.13', '5186d119132bfe07f66da74c50b190a4')
     version('0.12.12', '97b36a3b567e3438067c4a7d0075fd90')
     version('0.12.11', 'ea1710213cbb1d91b1d0318e6fa9aa37')
diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py
@@ -22,21 +22,6 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-#
-# This is a template package file for Spack.  We've put "FIXME"
-# next to all the things you'll want to change. Once you've handled
-# them, you can save this file and test your package like this:
-#
-#     spack install r-rcurl
-#
-# You can edit this file again by typing:
-#
-#     spack edit r-rcurl
-#
-# See the Spack documentation for more information on packaging.
-# If you submit this package back to Spack as a pull request,
-# please first remove this boilerplate and all FIXME comments.
-#
 from spack import *
 
 
@@ -54,7 +39,7 @@ class RRcurl(RPackage):
 
     homepage = "https://cran.rstudio.com/web/packages/RCurl/index.html"
     url      = "https://cran.rstudio.com/src/contrib/RCurl_1.95-4.8.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/RCurl"
 
     version('1.95-4.8', '9c8aaff986eb2792c89dd3ae54d21580')
 
diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py
@@ -33,7 +33,7 @@ class RShiny(RPackage):
 
     homepage = "http://shiny.rstudio.com/"
     url      = "https://cran.rstudio.com/src/contrib/shiny_1.0.5.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/shiny"
 
     version('1.0.5', '419dd5d3ea0bd87a07f8f0b1ef14fc13')
     version('0.13.2', 'cb5bff7a28ad59ec2883cd0912ca9611')
diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py
@@ -31,7 +31,7 @@ class RTibble(RPackage):
 
     homepage = "https://github.com/tidyverse/tibble"
     url      = "https://cran.rstudio.com/src/contrib/tibble_1.3.4.tar.gz"
-    list_url = homepage
+    list_url = "https://cran.r-project.org/src/contrib/Archive/tibble"
     version('1.3.4', '298e81546f999fb0968625698511b8d3')
     version('1.2', 'bdbc3d67aa16860741add6d6ec20ea13')
     version('1.1', '2fe9f806109d0b7fadafb1ffafea4cb8')
