Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] R: update to 4.0.2.
@ 2020-08-07 10:40 luhann
  2020-08-07 12:24 ` [PR PATCH] [Updated] " luhann
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: luhann @ 2020-08-07 10:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2509 bytes --]

There is a new pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

[WIP] R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

- [ ] R-cran-R6
- [ ] R-cran-RColorBrewer
- [ ] R-cran-Rcpp
- [ ] R-cran-assertthat
- [ ] R-cran-backports
- [ ] R-cran-callr
- [ ] R-cran-cli
- [ ] R-cran-colorspace
- [ ] R-cran-crayon
- [ ] R-cran-data.table
- [ ] R-cran-desc
- [ ] R-cran-dichromat
- [ ] R-cran-digest
- [ ] R-cran-ellipsis
- [ ] R-cran-evaluate
- [ ] R-cran-fansi
- [ ] R-cran-farver
- [ ] R-cran-generics
- [ ] R-cran-ggplot2
- [ ] R-cran-glue
- [ ] R-cran-gsubfn
- [ ] R-cran-gtable
- [ ] R-cran-isoband
- [ ] R-cran-labeling
- [ ] R-cran-lazyeval
- [ ] R-cran-lifecycle
- [ ] R-cran-lubridate
- [ ] R-cran-magrittr
- [ ] R-cran-munsell
- [ ] R-cran-nloptr
- [ ] R-cran-pillar
- [ ] R-cran-pkgbuild
- [ ] R-cran-pkgconfig
- [ ] R-cran-pkgload-
- [ ] R-cran-plyr
- [ ] R-cran-praise
- [ ] R-cran-prettyunits
- [ ] R-cran-processx
- [ ] R-cran-proto-
- [ ] R-cran-ps
- [ ] R-cran-reshape
- [ ] R-cran-rlang
- [ ] R-cran-rprojroot
- [ ] R-cran-rstudioapi
- [ ] R-cran-scales
- [ ] R-cran-stringi
- [ ] R-cran-stringr
- [ ] R-cran-testthat
- [ ] R-cran-tibble
- [ ] R-cran-utf8
- [ ] R-cran-vctrs
- [ ] R-cran-viridisLite
- [ ] R-cran-withr
- [ ] R-cran-zeallot
- [ ] R-cran-zoo
- [ ] emacs-ess
- [ ] rstudio


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 3859 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
@ 2020-08-07 12:24 ` luhann
  2020-08-07 13:30 ` luhann
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-07 12:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2514 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

[WIP] R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

- [ ] R-cran-R6
- [ ] R-cran-RColorBrewer
- [ ] R-cran-Rcpp
- [ ] R-cran-assertthat
- [ ] R-cran-backports
- [ ] R-cran-callr
- [ ] R-cran-cli
- [ ] R-cran-colorspace
- [ ] R-cran-crayon
- [ ] R-cran-data.table
- [ ] R-cran-desc
- [ ] R-cran-dichromat
- [ ] R-cran-digest
- [ ] R-cran-ellipsis
- [ ] R-cran-evaluate
- [ ] R-cran-fansi
- [ ] R-cran-farver
- [ ] R-cran-generics
- [ ] R-cran-ggplot2
- [ ] R-cran-glue
- [ ] R-cran-gsubfn
- [ ] R-cran-gtable
- [ ] R-cran-isoband
- [ ] R-cran-labeling
- [ ] R-cran-lazyeval
- [ ] R-cran-lifecycle
- [ ] R-cran-lubridate
- [ ] R-cran-magrittr
- [ ] R-cran-munsell
- [ ] R-cran-nloptr
- [ ] R-cran-pillar
- [ ] R-cran-pkgbuild
- [ ] R-cran-pkgconfig
- [ ] R-cran-pkgload-
- [ ] R-cran-plyr
- [ ] R-cran-praise
- [ ] R-cran-prettyunits
- [ ] R-cran-processx
- [ ] R-cran-proto-
- [ ] R-cran-ps
- [ ] R-cran-reshape
- [ ] R-cran-rlang
- [ ] R-cran-rprojroot
- [ ] R-cran-rstudioapi
- [ ] R-cran-scales
- [ ] R-cran-stringi
- [ ] R-cran-stringr
- [ ] R-cran-testthat
- [ ] R-cran-tibble
- [ ] R-cran-utf8
- [ ] R-cran-vctrs
- [ ] R-cran-viridisLite
- [ ] R-cran-withr
- [ ] R-cran-zeallot
- [ ] R-cran-zoo
- [ ] emacs-ess
- [ ] rstudio


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 6765 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 1/5] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 2/5] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 3/5] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 4/5] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 5/5] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
  2020-08-07 12:24 ` [PR PATCH] [Updated] " luhann
@ 2020-08-07 13:30 ` luhann
  2020-08-07 16:15 ` luhann
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-07 13:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2576 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

[WIP] R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [ ] R-cran-backports
- [ ] R-cran-callr
- [ ] R-cran-cli
- [ ] R-cran-colorspace
- [ ] R-cran-crayon
- [ ] R-cran-data.table
- [ ] R-cran-desc
- [ ] R-cran-dichromat
- [ ] R-cran-digest
- [ ] R-cran-ellipsis
- [ ] R-cran-evaluate
- [ ] R-cran-fansi
- [ ] R-cran-farver
- [ ] R-cran-generics
- [ ] R-cran-ggplot2
- [ ] R-cran-glue
- [ ] R-cran-gsubfn
- [ ] R-cran-gtable
- [ ] R-cran-isoband
- [ ] R-cran-labeling
- [ ] R-cran-lazyeval
- [ ] R-cran-lifecycle
- [ ] R-cran-lubridate
- [ ] R-cran-magrittr
- [ ] R-cran-munsell
- [ ] R-cran-nloptr
- [ ] R-cran-pillar
- [ ] R-cran-pkgbuild
- [ ] R-cran-pkgconfig
- [ ] R-cran-pkgload-
- [ ] R-cran-plyr
- [ ] R-cran-praise
- [ ] R-cran-prettyunits
- [ ] R-cran-processx
- [ ] R-cran-proto-
- [ ] R-cran-ps
- [ ] R-cran-reshape
- [ ] R-cran-rlang
- [ ] R-cran-rprojroot
- [ ] R-cran-rstudioapi
- [ ] R-cran-scales
- [ ] R-cran-stringi
- [ ] R-cran-stringr
- [ ] R-cran-testthat
- [ ] R-cran-tibble
- [ ] R-cran-utf8
- [ ] R-cran-vctrs
- [ ] R-cran-viridisLite
- [ ] R-cran-withr
- [ ] R-cran-zeallot
- [ ] R-cran-zoo
- [ ] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 13266 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 01/14] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 02/14] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 03/14] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 04/14] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 05/14] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 07659bfe58d26db1109c1a646b20d9f343c1076e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:31:19 +0200
Subject: [PATCH 06/14] R-cran-backports: revbump for R-4.0.2

---
 srcpkgs/R-cran-backports/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 1afd87bb025..7ac86ad237f 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-backports'
 pkgname=R-cran-backports
 version=1.1.8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="John <me@johnnynator.dev>"

From ebbb6944a606fae31491d847c7406951a39f1369 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:19:58 +0200
Subject: [PATCH 07/14] R-cran-callr: revbump for R-4.0.2

---
 srcpkgs/R-cran-callr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 555e6b136f5..d20af5bff29 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"

From e819a4eb118fa791fab7260e1eac6da8bec41eb5 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:11 +0200
Subject: [PATCH 08/14] R-cran-cli: revbump for R-4.0.2

---
 srcpkgs/R-cran-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index a995f5cce21..a37007c7325 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-cli'
 pkgname=R-cran-cli
 version=2.0.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"
 depends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"

From dee186984f098a27f7cbffe8690a33e444eb7163 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:17 +0200
Subject: [PATCH 09/14] R-cran-colorspace: revbump for R-4.0.2

---
 srcpkgs/R-cran-colorspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index c6c93ad6712..8490d34fdb5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-colorspace'
 pkgname=R-cran-colorspace
 version=1.4r1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 9b40a60fca1fc99ba9fb1b328d3d9bd5f3cdb037 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:44 +0200
Subject: [PATCH 10/14] R-cran-processx: revbump for R-4.0.2

---
 srcpkgs/R-cran-processx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index cc17b164c7a..e051b4b3682 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"

From 44a67f8073f9f00b789d96f2f828966770d32041 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:50 +0200
Subject: [PATCH 11/14] R-cran-ps: revbump for R-4.0.2

---
 srcpkgs/R-cran-ps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index be89ddf72b4..e199207460a 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
 version=1.3.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From c4a70c6c822caa798465418a71345d30a674f2a3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:16 +0200
Subject: [PATCH 12/14] R-cran-crayon: revbump for R-4.0.2

---
 srcpkgs/R-cran-crayon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index e880df10155..7ccc8230501 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-crayon'
 pkgname=R-cran-crayon
 version=1.3.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From a5c9d52ae8e8e8c4726a8d9f5d90b70a1e3c1239 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:48 +0200
Subject: [PATCH 13/14] R-cran-fansi: revbump for R-4.0.2

---
 srcpkgs/R-cran-fansi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 02201e3cb3b..23a088e6c89 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-fansi'
 pkgname=R-cran-fansi
 version=0.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From d0babf7fd0275d9a32a64e4fa353529b0acd43d2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:27:13 +0200
Subject: [PATCH 14/14] R-cran-glue: revbump for R-4.0.2

---
 srcpkgs/R-cran-glue/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 97dc31f7e17..48caa68cd5e 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-glue'
 pkgname=R-cran-glue
 version=1.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
  2020-08-07 12:24 ` [PR PATCH] [Updated] " luhann
  2020-08-07 13:30 ` luhann
@ 2020-08-07 16:15 ` luhann
  2020-08-07 21:56 ` luhann
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-07 16:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2655 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

[WIP] R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

Some R-cran-* packages failed xlint, so I've changed those where appropriate.

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [x] R-cran-backports
- [x] R-cran-callr
- [x] R-cran-cli
- [x] R-cran-colorspace
- [x] R-cran-crayon
- [x] R-cran-data.table
- [x] R-cran-desc
- [x] R-cran-dichromat
- [x] R-cran-digest
- [x] R-cran-ellipsis
- [x] R-cran-evaluate
- [x] R-cran-fansi
- [x] R-cran-farver
- [ ] R-cran-generics
- [ ] R-cran-ggplot2
- [x] R-cran-glue
- [x] R-cran-gsubfn
- [ ] R-cran-gtable
- [ ] R-cran-isoband
- [ ] R-cran-labeling
- [ ] R-cran-lazyeval
- [ ] R-cran-lifecycle
- [ ] R-cran-lubridate
- [ ] R-cran-magrittr
- [ ] R-cran-munsell
- [ ] R-cran-nloptr
- [ ] R-cran-pillar
- [ ] R-cran-pkgbuild
- [ ] R-cran-pkgconfig
- [ ] R-cran-pkgload
- [ ] R-cran-plyr
- [ ] R-cran-praise
- [ ] R-cran-prettyunits
- [x] R-cran-processx
- [x] R-cran-proto
- [x] R-cran-ps
- [ ] R-cran-reshape
- [x] R-cran-rlang
- [x] R-cran-rprojroot
- [ ] R-cran-rstudioapi
- [ ] R-cran-scales
- [ ] R-cran-stringi
- [ ] R-cran-stringr
- [ ] R-cran-testthat
- [ ] R-cran-tibble
- [ ] R-cran-utf8
- [ ] R-cran-vctrs
- [ ] R-cran-viridisLite
- [x] R-cran-withr
- [x] R-cran-zeallot
- [x] R-cran-zoo
- [ ] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 24230 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 01/28] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 02/28] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 03/28] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 04/28] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 05/28] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From bd618f5ed70006509b8ad6704c5004dc980fac27 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:31:19 +0200
Subject: [PATCH 06/28] R-cran-backports: revbump for R-4.0.2

---
 srcpkgs/R-cran-backports/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 1afd87bb025..afd9a2913da 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-backports'
 pkgname=R-cran-backports
 version=1.1.8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://github.com/r-lib/backports"
 checksum=c661b271433338274c4140caf7cf8254f13f1b8870ace0e7e4917238044b2cc7

From 27dd562b46317a3a45df58ae4a321f5e7c2f7d06 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:19:58 +0200
Subject: [PATCH 07/28] R-cran-callr: revbump for R-4.0.2

---
 srcpkgs/R-cran-callr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 555e6b136f5..d20af5bff29 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"

From 6505f02d2f0fc7d023cd2b25af76dadb755ad2e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:11 +0200
Subject: [PATCH 08/28] R-cran-cli: revbump for R-4.0.2

---
 srcpkgs/R-cran-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index a995f5cce21..a37007c7325 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-cli'
 pkgname=R-cran-cli
 version=2.0.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"
 depends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"

From 14ae66e84ac1116dbbf8795edcdf6879a2d414f0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:17 +0200
Subject: [PATCH 09/28] R-cran-colorspace: revbump for R-4.0.2

---
 srcpkgs/R-cran-colorspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index c6c93ad6712..8490d34fdb5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-colorspace'
 pkgname=R-cran-colorspace
 version=1.4r1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 7ca6a7f876aee158af6e2e15fc67e2bda579d82c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:44 +0200
Subject: [PATCH 10/28] R-cran-processx: revbump for R-4.0.2

---
 srcpkgs/R-cran-processx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index cc17b164c7a..e051b4b3682 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"

From ad0068eef06dfe5c6b3c9834a9a0eb22ef7a0b07 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:50 +0200
Subject: [PATCH 11/28] R-cran-ps: revbump for R-4.0.2

---
 srcpkgs/R-cran-ps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index be89ddf72b4..e199207460a 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
 version=1.3.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 14f38e3c6beb414b94597d4ffec7685aa2eaeced Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:16 +0200
Subject: [PATCH 12/28] R-cran-crayon: revbump for R-4.0.2

---
 srcpkgs/R-cran-crayon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index e880df10155..7ccc8230501 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-crayon'
 pkgname=R-cran-crayon
 version=1.3.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 6a4324f93119619137a4faf669d3360e5d9bd3c7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:48 +0200
Subject: [PATCH 13/28] R-cran-fansi: revbump for R-4.0.2

---
 srcpkgs/R-cran-fansi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 02201e3cb3b..23a088e6c89 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-fansi'
 pkgname=R-cran-fansi
 version=0.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From dcbc641c53ca9b6c9cbd8b86875cfdbf30fbebc3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:27:13 +0200
Subject: [PATCH 14/28] R-cran-glue: revbump for R-4.0.2

---
 srcpkgs/R-cran-glue/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 97dc31f7e17..48caa68cd5e 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-glue'
 pkgname=R-cran-glue
 version=1.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 601141bc36d517c681c9b7e018086684c69124d1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:06:44 +0200
Subject: [PATCH 15/28] R-cran-zoo: revbump for R-4.0.2

---
 srcpkgs/R-cran-zoo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index 12f7c4ed132..8b67dd292f5 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zoo'
 pkgname=R-cran-zoo
 version=1.8r8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 19d86e56e13cf6d554184b3fb5ca7b2c8e15da07 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:07:25 +0200
Subject: [PATCH 16/28] R-cran-zeallot: revbump for R-4.0.2

---
 srcpkgs/R-cran-zeallot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 0cf9f1e40eb..1aa2d4ec911 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zeallot'
 pkgname=R-cran-zeallot
 version=0.1.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="John <me@johnnynator.dev>"

From 91c266ad29978a793cd7cc9917f8e2618dd02d2e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:22 +0200
Subject: [PATCH 17/28] R-cran-withr: revbump for R-4.0.2

---
 srcpkgs/R-cran-withr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 25e2ed5fae6..b615b56ab15 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-withr'
 pkgname=R-cran-withr
 version=2.2.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 06aa5b6925b5fdc0b2e1ee6c3a8a3e7a3de1d450 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:56 +0200
Subject: [PATCH 18/28] R-cran-data.table: revbump for R-4.0.2

---
 srcpkgs/R-cran-data.table/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index b91448b2854..35159429af1 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-data.table'
 pkgname=R-cran-data.table
 version=1.13.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"

From 78bc340da7f2eb69e219ed60e4ccecd62b6c6910 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:09:44 +0200
Subject: [PATCH 19/28] R-cran-desc: revbump for R-4.0.2

---
 srcpkgs/R-cran-desc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index f8ae4c1b793..8770cb9a55b 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-desc'
 pkgname=R-cran-desc
 version=1.2.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"

From 13f449a16e012955a445cd5c41b1a1bee9382fb3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:10:11 +0200
Subject: [PATCH 20/28] R-cran-rprojroot: revbump for R-4.0.2

---
 srcpkgs/R-cran-rprojroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 12227aba34a..8e92f0febfc 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rprojroot'
 pkgname=R-cran-rprojroot
 version=1.3r2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-backports"
 depends="R-cran-backports"

From e93463d1e2228351d8a4cd3440830d2ca1022690 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:12 +0200
Subject: [PATCH 21/28] R-cran-dichromat: revbump for R-4.0.2

---
 srcpkgs/R-cran-dichromat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 7e19fe6eded..6d4cbc2cc20 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-dichromat'
 pkgname=R-cran-dichromat
 version=2.0r0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/dichromat/"
 checksum=31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1

From a401c89f89ac35085357af1bc5f45f386c24a780 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:56 +0200
Subject: [PATCH 22/28] R-cran-digest: revbump for R-4.0.2

---
 srcpkgs/R-cran-digest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 8b0a3f04ba5..fd9b13fbce8 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-digest'
 pkgname=R-cran-digest
 version=0.6.25
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 21f48a0656e9e42290a3d7e1750c5e03fa1de3a7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:12:53 +0200
Subject: [PATCH 23/28] R-cran-ellipsis: revbump for R-4.0.2

---
 srcpkgs/R-cran-ellipsis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 87d9baea125..f23754b7c8d 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ellipsis'
 pkgname=R-cran-ellipsis
 version=0.3.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"

From 2572448519731adf0340c21d8390f6295111154d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:13:22 +0200
Subject: [PATCH 24/28] R-cran-rlang: revbump for R-4.0.2

---
 srcpkgs/R-cran-rlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index a751bc3dfbd..33e1d96c82f 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rlang'
 pkgname=R-cran-rlang
 version=0.4.7
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 47b66a8377a6f049481a511152e2c13923e6f7d8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:16:55 +0200
Subject: [PATCH 25/28] R-cran-evaluate: revbump for R-4.0.2

---
 srcpkgs/R-cran-evaluate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index aa50c05d3d9..2f780356316 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-evaluate'
 pkgname=R-cran-evaluate
 version=0.14
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"

From 145a199f38792891ea76259566d0454c0cdb63e1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:11:25 +0200
Subject: [PATCH 26/28] R-cran-proto: revbump for R-4.0.2

---
 srcpkgs/R-cran-proto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index eb94bbb2392..e06c26391f1 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-proto'
 pkgname=R-cran-proto
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/hadley/proto"
 checksum=9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1

From ef12a413dc2e0990f2fd0f2c6c40a8bd41d57c38 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:12:28 +0200
Subject: [PATCH 27/28] R-cran-gsubfn: revbump for R-4.0.2

---
 srcpkgs/R-cran-gsubfn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 5f45a42c0d8..5d65a853312 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-gsubfn'
 pkgname=R-cran-gsubfn
 version=0.7
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-proto"
-makedepends+=" R-cran-proto"
+makedepends="R-cran-proto"
+depends="R-cran-proto"
 short_desc="Utilities for strings and function arguments"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"

From 66cd8fc3f6e8e0a7014e698419abc54d46c49979 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:14:36 +0200
Subject: [PATCH 28/28] R-cran-farver: revbump for R-4.0.2

---
 srcpkgs/R-cran-farver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 84c20c060f5..43c6b2c6362 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-farver'
 pkgname=R-cran-farver
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="High Performance Colour Space Manipulation"
 maintainer="John <me@johnnynator.dev>"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (2 preceding siblings ...)
  2020-08-07 16:15 ` luhann
@ 2020-08-07 21:56 ` luhann
  2020-08-09 12:34 ` luhann
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-07 21:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2656 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

[WIP] R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

Some R-cran-* packages failed xlint, so I've changed those where appropriate.

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [x] R-cran-backports
- [x] R-cran-callr
- [x] R-cran-cli
- [x] R-cran-colorspace
- [x] R-cran-crayon
- [x] R-cran-data.table
- [x] R-cran-desc
- [x] R-cran-dichromat
- [x] R-cran-digest
- [x] R-cran-ellipsis
- [x] R-cran-evaluate
- [x] R-cran-fansi
- [x] R-cran-farver
- [x] R-cran-generics
- [ ] R-cran-ggplot2
- [x] R-cran-glue
- [x] R-cran-gsubfn
- [ ] R-cran-gtable
- [ ] R-cran-isoband
- [ ] R-cran-labeling
- [ ] R-cran-lazyeval
- [x] R-cran-lifecycle
- [ ] R-cran-lubridate
- [x] R-cran-magrittr
- [x] R-cran-munsell
- [x] R-cran-nloptr
- [x] R-cran-pillar
- [ ] R-cran-pkgbuild
- [x] R-cran-pkgconfig
- [ ] R-cran-pkgload
- [x] R-cran-plyr
- [x] R-cran-praise
- [x] R-cran-prettyunits
- [x] R-cran-processx
- [x] R-cran-proto
- [x] R-cran-ps
- [x] R-cran-reshape2
- [x] R-cran-rlang
- [x] R-cran-rprojroot
- [ ] R-cran-rstudioapi
- [ ] R-cran-scales
- [x] R-cran-stringi
- [x] R-cran-stringr
- [ ] R-cran-testthat
- [x] R-cran-tibble
- [x] R-cran-utf8
- [x] R-cran-vctrs
- [x] R-cran-viridisLite
- [x] R-cran-withr
- [x] R-cran-zeallot
- [x] R-cran-zoo
- [ ] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 37169 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 01/45] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 02/45] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 03/45] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 04/45] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 05/45] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From bd618f5ed70006509b8ad6704c5004dc980fac27 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:31:19 +0200
Subject: [PATCH 06/45] R-cran-backports: revbump for R-4.0.2

---
 srcpkgs/R-cran-backports/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 1afd87bb025..afd9a2913da 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-backports'
 pkgname=R-cran-backports
 version=1.1.8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://github.com/r-lib/backports"
 checksum=c661b271433338274c4140caf7cf8254f13f1b8870ace0e7e4917238044b2cc7

From 27dd562b46317a3a45df58ae4a321f5e7c2f7d06 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:19:58 +0200
Subject: [PATCH 07/45] R-cran-callr: revbump for R-4.0.2

---
 srcpkgs/R-cran-callr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 555e6b136f5..d20af5bff29 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"

From 6505f02d2f0fc7d023cd2b25af76dadb755ad2e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:11 +0200
Subject: [PATCH 08/45] R-cran-cli: revbump for R-4.0.2

---
 srcpkgs/R-cran-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index a995f5cce21..a37007c7325 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-cli'
 pkgname=R-cran-cli
 version=2.0.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"
 depends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"

From 14ae66e84ac1116dbbf8795edcdf6879a2d414f0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:17 +0200
Subject: [PATCH 09/45] R-cran-colorspace: revbump for R-4.0.2

---
 srcpkgs/R-cran-colorspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index c6c93ad6712..8490d34fdb5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-colorspace'
 pkgname=R-cran-colorspace
 version=1.4r1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 7ca6a7f876aee158af6e2e15fc67e2bda579d82c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:44 +0200
Subject: [PATCH 10/45] R-cran-processx: revbump for R-4.0.2

---
 srcpkgs/R-cran-processx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index cc17b164c7a..e051b4b3682 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"

From ad0068eef06dfe5c6b3c9834a9a0eb22ef7a0b07 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:50 +0200
Subject: [PATCH 11/45] R-cran-ps: revbump for R-4.0.2

---
 srcpkgs/R-cran-ps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index be89ddf72b4..e199207460a 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
 version=1.3.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 14f38e3c6beb414b94597d4ffec7685aa2eaeced Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:16 +0200
Subject: [PATCH 12/45] R-cran-crayon: revbump for R-4.0.2

---
 srcpkgs/R-cran-crayon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index e880df10155..7ccc8230501 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-crayon'
 pkgname=R-cran-crayon
 version=1.3.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 6a4324f93119619137a4faf669d3360e5d9bd3c7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:48 +0200
Subject: [PATCH 13/45] R-cran-fansi: revbump for R-4.0.2

---
 srcpkgs/R-cran-fansi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 02201e3cb3b..23a088e6c89 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-fansi'
 pkgname=R-cran-fansi
 version=0.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From dcbc641c53ca9b6c9cbd8b86875cfdbf30fbebc3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:27:13 +0200
Subject: [PATCH 14/45] R-cran-glue: revbump for R-4.0.2

---
 srcpkgs/R-cran-glue/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 97dc31f7e17..48caa68cd5e 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-glue'
 pkgname=R-cran-glue
 version=1.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 601141bc36d517c681c9b7e018086684c69124d1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:06:44 +0200
Subject: [PATCH 15/45] R-cran-zoo: revbump for R-4.0.2

---
 srcpkgs/R-cran-zoo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index 12f7c4ed132..8b67dd292f5 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zoo'
 pkgname=R-cran-zoo
 version=1.8r8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 19d86e56e13cf6d554184b3fb5ca7b2c8e15da07 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:07:25 +0200
Subject: [PATCH 16/45] R-cran-zeallot: revbump for R-4.0.2

---
 srcpkgs/R-cran-zeallot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 0cf9f1e40eb..1aa2d4ec911 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zeallot'
 pkgname=R-cran-zeallot
 version=0.1.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="John <me@johnnynator.dev>"

From 91c266ad29978a793cd7cc9917f8e2618dd02d2e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:22 +0200
Subject: [PATCH 17/45] R-cran-withr: revbump for R-4.0.2

---
 srcpkgs/R-cran-withr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 25e2ed5fae6..b615b56ab15 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-withr'
 pkgname=R-cran-withr
 version=2.2.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 06aa5b6925b5fdc0b2e1ee6c3a8a3e7a3de1d450 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:56 +0200
Subject: [PATCH 18/45] R-cran-data.table: revbump for R-4.0.2

---
 srcpkgs/R-cran-data.table/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index b91448b2854..35159429af1 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-data.table'
 pkgname=R-cran-data.table
 version=1.13.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"

From 78bc340da7f2eb69e219ed60e4ccecd62b6c6910 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:09:44 +0200
Subject: [PATCH 19/45] R-cran-desc: revbump for R-4.0.2

---
 srcpkgs/R-cran-desc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index f8ae4c1b793..8770cb9a55b 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-desc'
 pkgname=R-cran-desc
 version=1.2.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"

From 13f449a16e012955a445cd5c41b1a1bee9382fb3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:10:11 +0200
Subject: [PATCH 20/45] R-cran-rprojroot: revbump for R-4.0.2

---
 srcpkgs/R-cran-rprojroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 12227aba34a..8e92f0febfc 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rprojroot'
 pkgname=R-cran-rprojroot
 version=1.3r2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-backports"
 depends="R-cran-backports"

From e93463d1e2228351d8a4cd3440830d2ca1022690 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:12 +0200
Subject: [PATCH 21/45] R-cran-dichromat: revbump for R-4.0.2

---
 srcpkgs/R-cran-dichromat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 7e19fe6eded..6d4cbc2cc20 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-dichromat'
 pkgname=R-cran-dichromat
 version=2.0r0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/dichromat/"
 checksum=31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1

From a401c89f89ac35085357af1bc5f45f386c24a780 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:56 +0200
Subject: [PATCH 22/45] R-cran-digest: revbump for R-4.0.2

---
 srcpkgs/R-cran-digest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 8b0a3f04ba5..fd9b13fbce8 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-digest'
 pkgname=R-cran-digest
 version=0.6.25
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 21f48a0656e9e42290a3d7e1750c5e03fa1de3a7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:12:53 +0200
Subject: [PATCH 23/45] R-cran-ellipsis: revbump for R-4.0.2

---
 srcpkgs/R-cran-ellipsis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 87d9baea125..f23754b7c8d 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ellipsis'
 pkgname=R-cran-ellipsis
 version=0.3.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"

From 2572448519731adf0340c21d8390f6295111154d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:13:22 +0200
Subject: [PATCH 24/45] R-cran-rlang: revbump for R-4.0.2

---
 srcpkgs/R-cran-rlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index a751bc3dfbd..33e1d96c82f 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rlang'
 pkgname=R-cran-rlang
 version=0.4.7
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 47b66a8377a6f049481a511152e2c13923e6f7d8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:16:55 +0200
Subject: [PATCH 25/45] R-cran-evaluate: revbump for R-4.0.2

---
 srcpkgs/R-cran-evaluate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index aa50c05d3d9..2f780356316 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-evaluate'
 pkgname=R-cran-evaluate
 version=0.14
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"

From 145a199f38792891ea76259566d0454c0cdb63e1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:11:25 +0200
Subject: [PATCH 26/45] R-cran-proto: revbump for R-4.0.2

---
 srcpkgs/R-cran-proto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index eb94bbb2392..e06c26391f1 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-proto'
 pkgname=R-cran-proto
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/hadley/proto"
 checksum=9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1

From ef12a413dc2e0990f2fd0f2c6c40a8bd41d57c38 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:12:28 +0200
Subject: [PATCH 27/45] R-cran-gsubfn: revbump for R-4.0.2

---
 srcpkgs/R-cran-gsubfn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 5f45a42c0d8..5d65a853312 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-gsubfn'
 pkgname=R-cran-gsubfn
 version=0.7
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-proto"
-makedepends+=" R-cran-proto"
+makedepends="R-cran-proto"
+depends="R-cran-proto"
 short_desc="Utilities for strings and function arguments"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"

From 66cd8fc3f6e8e0a7014e698419abc54d46c49979 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:14:36 +0200
Subject: [PATCH 28/45] R-cran-farver: revbump for R-4.0.2

---
 srcpkgs/R-cran-farver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 84c20c060f5..43c6b2c6362 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-farver'
 pkgname=R-cran-farver
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="High Performance Colour Space Manipulation"
 maintainer="John <me@johnnynator.dev>"

From 19fc8f06edb84ac16a8fd2a12ce4584945c68e9f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:14 +0200
Subject: [PATCH 29/45] R-cran-viridisLite: revbump for R-4.0.2

---
 srcpkgs/R-cran-viridisLite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index 621dbedde25..c0b75985997 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-viridisLite'
 pkgname=R-cran-viridisLite
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 2e63a20d98853f1942b9593f6fe0722857652bb7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:50 +0200
Subject: [PATCH 30/45] R-cran-vctrs: revbump for R-4.0.2

---
 srcpkgs/R-cran-vctrs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 6842bdc0003..117a41b16c0 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-vctrs'
 pkgname=R-cran-vctrs
 version=0.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"

From a6c0df74b2c69bb421cc0c8085afb6237c5e2697 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:34:56 +0200
Subject: [PATCH 31/45] R-cran-utf8: revbump for R-4.0.2

---
 srcpkgs/R-cran-utf8/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index d3da68930bb..55923b13fa5 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -1,14 +1,10 @@
 # Template file for 'R-cran-utf8'
 pkgname=R-cran-utf8
 version=1.1.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
 homepage="https://github.com/patperry/r-utf8/"
 checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
-
-post_install() {
-	vlicense LICENSE
-}

From f59d41936dd353c12996fcd261b63e3471117070 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:02 +0200
Subject: [PATCH 32/45] R-cran-tibble: revbump for R-4.0.2

---
 srcpkgs/R-cran-tibble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 7208b4e07b4..6e5300749c2 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-tibble'
 pkgname=R-cran-tibble
 version=3.0.3
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis
  R-cran-fansi R-cran-lifecycle R-cran-magrittr

From ad73cc8b1f9d48b3edfb10f79dd72554819c6674 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:47 +0200
Subject: [PATCH 33/45] R-cran-lifecycle: revbump for R-4.0.2

---
 srcpkgs/R-cran-lifecycle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index efe7780af57..895a649705f 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lifecycle'
 pkgname=R-cran-lifecycle
 version=0.2.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"

From 8c679db1a4f37b1d9689207c18fb53ccf00a8785 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:39:25 +0200
Subject: [PATCH 34/45] R-cran-magrittr: revbump for R-4.0.2

---
 srcpkgs/R-cran-magrittr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index d180b2d661d..44af2806c82 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -1,9 +1,9 @@
 # Template file for 'R-cran-magrittr'
 pkgname=R-cran-magrittr
 version=1.5
-revision=1
+revision=2
 build_style=R-cran
-short_desc="A Forward-Pipe Operator for R"
+short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/magrittr/index.html"

From d84414a6a4e603030a3e72a26c416f29e4150a04 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:04 +0200
Subject: [PATCH 35/45] R-cran-pillar: revbump for R-4.0.2

---
 srcpkgs/R-cran-pillar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index 363430a948e..66a4da300d7 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pillar'
 pkgname=R-cran-pillar
 version=1.4.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-lifecycle R-cran-rlang R-cran-utf8
  R-cran-fansi R-cran-vctrs"

From 3c01cc1039ec7d9dbeef6ad5a72c45272b495a8f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:44 +0200
Subject: [PATCH 36/45] R-cran-pkgconfig: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index dfa28b1b3bb..5d96a44beca 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgconfig'
 pkgname=R-cran-pkgconfig
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"

From 9b88e82928d1678d0b854e98c294fa340668e5c8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:34 +0200
Subject: [PATCH 37/45] R-cran-nloptr: revbump for R-4.0.2

---
 srcpkgs/R-cran-nloptr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index e29693f7971..aff2a57da94 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-nloptr'
 pkgname=R-cran-nloptr
 version=1.2.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="pkg-config"
 makedepends="nlopt-devel"

From 452be5aab94fdf680b2b40d75494f93539df178f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:52 +0200
Subject: [PATCH 38/45] R-cran-munsell: revbump for R-4.0.2

---
 srcpkgs/R-cran-munsell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index f4c54b04962..79dfa4ee3be 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-munsell'
 pkgname=R-cran-munsell
 version=0.5.0
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-colorspace"
-makedepends+=" R-cran-colorspace"
+makedepends="R-cran-colorspace"
+depends="R-cran-colorspace"
 short_desc="Utilities for Using Munsell Colours"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"

From 01387af763cf086f39a2b074213ef05a83d2ad9c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:47:42 +0200
Subject: [PATCH 39/45] R-cran-generics: revbump for R-4.0.2

---
 srcpkgs/R-cran-generics/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 080a9086537..d35b29a6a34 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-generics'
 pkgname=R-cran-generics
 version=0.0.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"

From cdf3a9db9adb508f3502b35ac6fc1d72d6bac44c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:48:26 +0200
Subject: [PATCH 40/45] R-cran-praise: revbump for R-4.0.2

---
 srcpkgs/R-cran-praise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index 0be89154fdd..99bf129de0e 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-praise'
 pkgname=R-cran-praise
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From a253fa08971d174abf09d1dab4b2c3f5456705d0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:06 +0200
Subject: [PATCH 41/45] R-cran-prettyunits: revbump for R-4.0.2

---
 srcpkgs/R-cran-prettyunits/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 08ee698869e..918a4da4ea8 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-prettyunits'
 pkgname=R-cran-prettyunits
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From b67ff72bbd269829bfcb173789ed493b101f17c1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:47 +0200
Subject: [PATCH 42/45] R-cran-reshape2: revbump for R-4.0.2

---
 srcpkgs/R-cran-reshape2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index dc30c03cf1c..fbc8a6b6aa9 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-reshape2'
 pkgname=R-cran-reshape2
 version=1.4.4
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-plyr R-cran-stringr R-cran-Rcpp"
 depends="R-cran-plyr>=1.8.1 R-cran-stringr R-cran-Rcpp"

From 10e4294737814f0f7730123f3c05f43808927ce8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:51:34 +0200
Subject: [PATCH 43/45] R-cran-plyr: revbump for R-4.0.2

---
 srcpkgs/R-cran-plyr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index 3775dc999ad..c046ee5601c 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-plyr'
 pkgname=R-cran-plyr
 version=1.8.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-Rcpp"
 depends="R-cran-Rcpp>=0.11.0"

From a1e9862b65f283709e2e8365f7e0dfff3398a3f9 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:52:24 +0200
Subject: [PATCH 44/45] R-cran-stringr: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index e11de59085c..9c4c5ffa24b 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringr'
 pkgname=R-cran-stringr
 version=1.4.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-stringi R-cran-magrittr R-cran-glue"
 depends="R-cran-stringi>=1.1.7 R-cran-magrittr R-cran-glue>=1.2.0"

From 87c7ecec288c3e48abbb272cbbd20808f300e7a3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:53:16 +0200
Subject: [PATCH 45/45] R-cran-stringi: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index fc2bddc2e02..b7420242f6a 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.4.6
-revision=2
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (3 preceding siblings ...)
  2020-08-07 21:56 ` luhann
@ 2020-08-09 12:34 ` luhann
  2020-08-12 10:22 ` [PR PATCH] [Updated] " luhann
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-09 12:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2656 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

[WIP] R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

Some R-cran-* packages failed xlint, so I've changed those where appropriate.

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [x] R-cran-backports
- [x] R-cran-callr
- [x] R-cran-cli
- [x] R-cran-colorspace
- [x] R-cran-crayon
- [x] R-cran-data.table
- [x] R-cran-desc
- [x] R-cran-dichromat
- [x] R-cran-digest
- [x] R-cran-ellipsis
- [x] R-cran-evaluate
- [x] R-cran-fansi
- [x] R-cran-farver
- [x] R-cran-generics
- [x] R-cran-ggplot2
- [x] R-cran-glue
- [x] R-cran-gsubfn
- [x] R-cran-gtable
- [x] R-cran-isoband
- [x] R-cran-labeling
- [x] R-cran-lazyeval
- [x] R-cran-lifecycle
- [x] R-cran-lubridate
- [x] R-cran-magrittr
- [x] R-cran-munsell
- [x] R-cran-nloptr
- [x] R-cran-pillar
- [x] R-cran-pkgbuild
- [x] R-cran-pkgconfig
- [x] R-cran-pkgload
- [x] R-cran-plyr
- [x] R-cran-praise
- [x] R-cran-prettyunits
- [x] R-cran-processx
- [x] R-cran-proto
- [x] R-cran-ps
- [x] R-cran-reshape2
- [x] R-cran-rlang
- [x] R-cran-rprojroot
- [x] R-cran-rstudioapi
- [x] R-cran-scales
- [x] R-cran-stringi
- [x] R-cran-stringr
- [x] R-cran-testthat
- [x] R-cran-tibble
- [x] R-cran-utf8
- [x] R-cran-vctrs
- [x] R-cran-viridisLite
- [x] R-cran-withr
- [x] R-cran-zeallot
- [x] R-cran-zoo
- [x] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 45937 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 01/57] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 02/57] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 03/57] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 04/57] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 05/57] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From bd618f5ed70006509b8ad6704c5004dc980fac27 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:31:19 +0200
Subject: [PATCH 06/57] R-cran-backports: revbump for R-4.0.2

---
 srcpkgs/R-cran-backports/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 1afd87bb025..afd9a2913da 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-backports'
 pkgname=R-cran-backports
 version=1.1.8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://github.com/r-lib/backports"
 checksum=c661b271433338274c4140caf7cf8254f13f1b8870ace0e7e4917238044b2cc7

From 27dd562b46317a3a45df58ae4a321f5e7c2f7d06 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:19:58 +0200
Subject: [PATCH 07/57] R-cran-callr: revbump for R-4.0.2

---
 srcpkgs/R-cran-callr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 555e6b136f5..d20af5bff29 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"

From 6505f02d2f0fc7d023cd2b25af76dadb755ad2e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:11 +0200
Subject: [PATCH 08/57] R-cran-cli: revbump for R-4.0.2

---
 srcpkgs/R-cran-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index a995f5cce21..a37007c7325 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-cli'
 pkgname=R-cran-cli
 version=2.0.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"
 depends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"

From 14ae66e84ac1116dbbf8795edcdf6879a2d414f0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:17 +0200
Subject: [PATCH 09/57] R-cran-colorspace: revbump for R-4.0.2

---
 srcpkgs/R-cran-colorspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index c6c93ad6712..8490d34fdb5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-colorspace'
 pkgname=R-cran-colorspace
 version=1.4r1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 7ca6a7f876aee158af6e2e15fc67e2bda579d82c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:44 +0200
Subject: [PATCH 10/57] R-cran-processx: revbump for R-4.0.2

---
 srcpkgs/R-cran-processx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index cc17b164c7a..e051b4b3682 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"

From ad0068eef06dfe5c6b3c9834a9a0eb22ef7a0b07 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:50 +0200
Subject: [PATCH 11/57] R-cran-ps: revbump for R-4.0.2

---
 srcpkgs/R-cran-ps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index be89ddf72b4..e199207460a 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
 version=1.3.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 14f38e3c6beb414b94597d4ffec7685aa2eaeced Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:16 +0200
Subject: [PATCH 12/57] R-cran-crayon: revbump for R-4.0.2

---
 srcpkgs/R-cran-crayon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index e880df10155..7ccc8230501 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-crayon'
 pkgname=R-cran-crayon
 version=1.3.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 6a4324f93119619137a4faf669d3360e5d9bd3c7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:48 +0200
Subject: [PATCH 13/57] R-cran-fansi: revbump for R-4.0.2

---
 srcpkgs/R-cran-fansi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 02201e3cb3b..23a088e6c89 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-fansi'
 pkgname=R-cran-fansi
 version=0.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From dcbc641c53ca9b6c9cbd8b86875cfdbf30fbebc3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:27:13 +0200
Subject: [PATCH 14/57] R-cran-glue: revbump for R-4.0.2

---
 srcpkgs/R-cran-glue/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 97dc31f7e17..48caa68cd5e 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-glue'
 pkgname=R-cran-glue
 version=1.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 601141bc36d517c681c9b7e018086684c69124d1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:06:44 +0200
Subject: [PATCH 15/57] R-cran-zoo: revbump for R-4.0.2

---
 srcpkgs/R-cran-zoo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index 12f7c4ed132..8b67dd292f5 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zoo'
 pkgname=R-cran-zoo
 version=1.8r8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 19d86e56e13cf6d554184b3fb5ca7b2c8e15da07 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:07:25 +0200
Subject: [PATCH 16/57] R-cran-zeallot: revbump for R-4.0.2

---
 srcpkgs/R-cran-zeallot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 0cf9f1e40eb..1aa2d4ec911 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zeallot'
 pkgname=R-cran-zeallot
 version=0.1.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="John <me@johnnynator.dev>"

From 91c266ad29978a793cd7cc9917f8e2618dd02d2e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:22 +0200
Subject: [PATCH 17/57] R-cran-withr: revbump for R-4.0.2

---
 srcpkgs/R-cran-withr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 25e2ed5fae6..b615b56ab15 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-withr'
 pkgname=R-cran-withr
 version=2.2.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 06aa5b6925b5fdc0b2e1ee6c3a8a3e7a3de1d450 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:56 +0200
Subject: [PATCH 18/57] R-cran-data.table: revbump for R-4.0.2

---
 srcpkgs/R-cran-data.table/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index b91448b2854..35159429af1 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-data.table'
 pkgname=R-cran-data.table
 version=1.13.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"

From 78bc340da7f2eb69e219ed60e4ccecd62b6c6910 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:09:44 +0200
Subject: [PATCH 19/57] R-cran-desc: revbump for R-4.0.2

---
 srcpkgs/R-cran-desc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index f8ae4c1b793..8770cb9a55b 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-desc'
 pkgname=R-cran-desc
 version=1.2.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"

From 13f449a16e012955a445cd5c41b1a1bee9382fb3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:10:11 +0200
Subject: [PATCH 20/57] R-cran-rprojroot: revbump for R-4.0.2

---
 srcpkgs/R-cran-rprojroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 12227aba34a..8e92f0febfc 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rprojroot'
 pkgname=R-cran-rprojroot
 version=1.3r2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-backports"
 depends="R-cran-backports"

From e93463d1e2228351d8a4cd3440830d2ca1022690 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:12 +0200
Subject: [PATCH 21/57] R-cran-dichromat: revbump for R-4.0.2

---
 srcpkgs/R-cran-dichromat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 7e19fe6eded..6d4cbc2cc20 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-dichromat'
 pkgname=R-cran-dichromat
 version=2.0r0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/dichromat/"
 checksum=31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1

From a401c89f89ac35085357af1bc5f45f386c24a780 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:56 +0200
Subject: [PATCH 22/57] R-cran-digest: revbump for R-4.0.2

---
 srcpkgs/R-cran-digest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 8b0a3f04ba5..fd9b13fbce8 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-digest'
 pkgname=R-cran-digest
 version=0.6.25
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 21f48a0656e9e42290a3d7e1750c5e03fa1de3a7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:12:53 +0200
Subject: [PATCH 23/57] R-cran-ellipsis: revbump for R-4.0.2

---
 srcpkgs/R-cran-ellipsis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 87d9baea125..f23754b7c8d 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ellipsis'
 pkgname=R-cran-ellipsis
 version=0.3.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"

From 2572448519731adf0340c21d8390f6295111154d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:13:22 +0200
Subject: [PATCH 24/57] R-cran-rlang: revbump for R-4.0.2

---
 srcpkgs/R-cran-rlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index a751bc3dfbd..33e1d96c82f 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rlang'
 pkgname=R-cran-rlang
 version=0.4.7
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 47b66a8377a6f049481a511152e2c13923e6f7d8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:16:55 +0200
Subject: [PATCH 25/57] R-cran-evaluate: revbump for R-4.0.2

---
 srcpkgs/R-cran-evaluate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index aa50c05d3d9..2f780356316 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-evaluate'
 pkgname=R-cran-evaluate
 version=0.14
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"

From 145a199f38792891ea76259566d0454c0cdb63e1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:11:25 +0200
Subject: [PATCH 26/57] R-cran-proto: revbump for R-4.0.2

---
 srcpkgs/R-cran-proto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index eb94bbb2392..e06c26391f1 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-proto'
 pkgname=R-cran-proto
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/hadley/proto"
 checksum=9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1

From ef12a413dc2e0990f2fd0f2c6c40a8bd41d57c38 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:12:28 +0200
Subject: [PATCH 27/57] R-cran-gsubfn: revbump for R-4.0.2

---
 srcpkgs/R-cran-gsubfn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 5f45a42c0d8..5d65a853312 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-gsubfn'
 pkgname=R-cran-gsubfn
 version=0.7
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-proto"
-makedepends+=" R-cran-proto"
+makedepends="R-cran-proto"
+depends="R-cran-proto"
 short_desc="Utilities for strings and function arguments"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"

From 66cd8fc3f6e8e0a7014e698419abc54d46c49979 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:14:36 +0200
Subject: [PATCH 28/57] R-cran-farver: revbump for R-4.0.2

---
 srcpkgs/R-cran-farver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 84c20c060f5..43c6b2c6362 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-farver'
 pkgname=R-cran-farver
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="High Performance Colour Space Manipulation"
 maintainer="John <me@johnnynator.dev>"

From 19fc8f06edb84ac16a8fd2a12ce4584945c68e9f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:14 +0200
Subject: [PATCH 29/57] R-cran-viridisLite: revbump for R-4.0.2

---
 srcpkgs/R-cran-viridisLite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index 621dbedde25..c0b75985997 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-viridisLite'
 pkgname=R-cran-viridisLite
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 2e63a20d98853f1942b9593f6fe0722857652bb7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:50 +0200
Subject: [PATCH 30/57] R-cran-vctrs: revbump for R-4.0.2

---
 srcpkgs/R-cran-vctrs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 6842bdc0003..117a41b16c0 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-vctrs'
 pkgname=R-cran-vctrs
 version=0.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"

From a6c0df74b2c69bb421cc0c8085afb6237c5e2697 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:34:56 +0200
Subject: [PATCH 31/57] R-cran-utf8: revbump for R-4.0.2

---
 srcpkgs/R-cran-utf8/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index d3da68930bb..55923b13fa5 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -1,14 +1,10 @@
 # Template file for 'R-cran-utf8'
 pkgname=R-cran-utf8
 version=1.1.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
 homepage="https://github.com/patperry/r-utf8/"
 checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
-
-post_install() {
-	vlicense LICENSE
-}

From f59d41936dd353c12996fcd261b63e3471117070 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:02 +0200
Subject: [PATCH 32/57] R-cran-tibble: revbump for R-4.0.2

---
 srcpkgs/R-cran-tibble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 7208b4e07b4..6e5300749c2 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-tibble'
 pkgname=R-cran-tibble
 version=3.0.3
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis
  R-cran-fansi R-cran-lifecycle R-cran-magrittr

From ad73cc8b1f9d48b3edfb10f79dd72554819c6674 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:47 +0200
Subject: [PATCH 33/57] R-cran-lifecycle: revbump for R-4.0.2

---
 srcpkgs/R-cran-lifecycle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index efe7780af57..895a649705f 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lifecycle'
 pkgname=R-cran-lifecycle
 version=0.2.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"

From 8c679db1a4f37b1d9689207c18fb53ccf00a8785 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:39:25 +0200
Subject: [PATCH 34/57] R-cran-magrittr: revbump for R-4.0.2

---
 srcpkgs/R-cran-magrittr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index d180b2d661d..44af2806c82 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -1,9 +1,9 @@
 # Template file for 'R-cran-magrittr'
 pkgname=R-cran-magrittr
 version=1.5
-revision=1
+revision=2
 build_style=R-cran
-short_desc="A Forward-Pipe Operator for R"
+short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/magrittr/index.html"

From d84414a6a4e603030a3e72a26c416f29e4150a04 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:04 +0200
Subject: [PATCH 35/57] R-cran-pillar: revbump for R-4.0.2

---
 srcpkgs/R-cran-pillar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index 363430a948e..66a4da300d7 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pillar'
 pkgname=R-cran-pillar
 version=1.4.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-lifecycle R-cran-rlang R-cran-utf8
  R-cran-fansi R-cran-vctrs"

From 3c01cc1039ec7d9dbeef6ad5a72c45272b495a8f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:44 +0200
Subject: [PATCH 36/57] R-cran-pkgconfig: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index dfa28b1b3bb..5d96a44beca 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgconfig'
 pkgname=R-cran-pkgconfig
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"

From 9b88e82928d1678d0b854e98c294fa340668e5c8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:34 +0200
Subject: [PATCH 37/57] R-cran-nloptr: revbump for R-4.0.2

---
 srcpkgs/R-cran-nloptr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index e29693f7971..aff2a57da94 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-nloptr'
 pkgname=R-cran-nloptr
 version=1.2.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="pkg-config"
 makedepends="nlopt-devel"

From 452be5aab94fdf680b2b40d75494f93539df178f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:52 +0200
Subject: [PATCH 38/57] R-cran-munsell: revbump for R-4.0.2

---
 srcpkgs/R-cran-munsell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index f4c54b04962..79dfa4ee3be 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-munsell'
 pkgname=R-cran-munsell
 version=0.5.0
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-colorspace"
-makedepends+=" R-cran-colorspace"
+makedepends="R-cran-colorspace"
+depends="R-cran-colorspace"
 short_desc="Utilities for Using Munsell Colours"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"

From 01387af763cf086f39a2b074213ef05a83d2ad9c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:47:42 +0200
Subject: [PATCH 39/57] R-cran-generics: revbump for R-4.0.2

---
 srcpkgs/R-cran-generics/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 080a9086537..d35b29a6a34 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-generics'
 pkgname=R-cran-generics
 version=0.0.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"

From cdf3a9db9adb508f3502b35ac6fc1d72d6bac44c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:48:26 +0200
Subject: [PATCH 40/57] R-cran-praise: revbump for R-4.0.2

---
 srcpkgs/R-cran-praise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index 0be89154fdd..99bf129de0e 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-praise'
 pkgname=R-cran-praise
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From a253fa08971d174abf09d1dab4b2c3f5456705d0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:06 +0200
Subject: [PATCH 41/57] R-cran-prettyunits: revbump for R-4.0.2

---
 srcpkgs/R-cran-prettyunits/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 08ee698869e..918a4da4ea8 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-prettyunits'
 pkgname=R-cran-prettyunits
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From b67ff72bbd269829bfcb173789ed493b101f17c1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:47 +0200
Subject: [PATCH 42/57] R-cran-reshape2: revbump for R-4.0.2

---
 srcpkgs/R-cran-reshape2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index dc30c03cf1c..fbc8a6b6aa9 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-reshape2'
 pkgname=R-cran-reshape2
 version=1.4.4
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-plyr R-cran-stringr R-cran-Rcpp"
 depends="R-cran-plyr>=1.8.1 R-cran-stringr R-cran-Rcpp"

From 10e4294737814f0f7730123f3c05f43808927ce8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:51:34 +0200
Subject: [PATCH 43/57] R-cran-plyr: revbump for R-4.0.2

---
 srcpkgs/R-cran-plyr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index 3775dc999ad..c046ee5601c 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-plyr'
 pkgname=R-cran-plyr
 version=1.8.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-Rcpp"
 depends="R-cran-Rcpp>=0.11.0"

From a1e9862b65f283709e2e8365f7e0dfff3398a3f9 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:52:24 +0200
Subject: [PATCH 44/57] R-cran-stringr: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index e11de59085c..9c4c5ffa24b 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringr'
 pkgname=R-cran-stringr
 version=1.4.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-stringi R-cran-magrittr R-cran-glue"
 depends="R-cran-stringi>=1.1.7 R-cran-magrittr R-cran-glue>=1.2.0"

From 87c7ecec288c3e48abbb272cbbd20808f300e7a3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:53:16 +0200
Subject: [PATCH 45/57] R-cran-stringi: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index fc2bddc2e02..b7420242f6a 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.4.6
-revision=2
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From 9728ecb2b01a7290d106d2a4a4fd5983a8f77c85 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:04:25 +0200
Subject: [PATCH 46/57] R-cran-rstudioapi: revbump for R-4.0.2

---
 srcpkgs/R-cran-rstudioapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index 22dff81e6da..834afe66f5f 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rstudioapi'
 pkgname=R-cran-rstudioapi
 version=0.11
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 73e007772ed4c4da487c682ee501ab4f3d8b1442 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:06:24 +0200
Subject: [PATCH 47/57] R-cran-pkgbuild: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgbuild/template b/srcpkgs/R-cran-pkgbuild/template
index 333e2dc440e..539be556b82 100644
--- a/srcpkgs/R-cran-pkgbuild/template
+++ b/srcpkgs/R-cran-pkgbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgbuild'
 pkgname=R-cran-pkgbuild
 version=1.1.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-callr R-cran-cli R-cran-crayon R-cran-desc
  R-cran-prettyunits R-cran-R6 R-cran-rprojroot R-cran-withr"

From aa25430206a68f96ea0e7b96a51b14f1006710a9 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:07:08 +0200
Subject: [PATCH 48/57] R-cran-pkgload: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgload/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgload/template b/srcpkgs/R-cran-pkgload/template
index 1c19bfcf74e..b4ee55f56b3 100644
--- a/srcpkgs/R-cran-pkgload/template
+++ b/srcpkgs/R-cran-pkgload/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgload'
 pkgname=R-cran-pkgload
 version=1.1.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-desc R-cran-pkgbuild
  R-cran-rlang R-cran-rprojroot R-cran-rstudioapi R-cran-withr"

From 0b059c5c5b30c77bb65b625bd24bc1d7457c50de Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:10:19 +0200
Subject: [PATCH 49/57] R-cran-scales: revbump for R-4.0.2

---
 srcpkgs/R-cran-scales/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template
index 59d94fe7c63..c4dec24cdbc 100644
--- a/srcpkgs/R-cran-scales/template
+++ b/srcpkgs/R-cran-scales/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-scales'
 pkgname=R-cran-scales
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-RColorBrewer R-cran-farver
  R-cran-munsell R-cran-labeling R-cran-R6

From ca8b93aa61b6b5febc84f5c3f3ac249802e98c1a Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:11:29 +0200
Subject: [PATCH 50/57] R-cran-lubridate: revbump for R-4.0.2

---
 srcpkgs/R-cran-lubridate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lubridate/template b/srcpkgs/R-cran-lubridate/template
index 3a6e7e93250..76601e943c2 100644
--- a/srcpkgs/R-cran-lubridate/template
+++ b/srcpkgs/R-cran-lubridate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lubridate'
 pkgname=R-cran-lubridate
 version=1.7.9
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-generics R-cran-Rcpp"
 depends="R-cran-generics R-cran-Rcpp>=0.12.13"

From d320f0c2dfd0e99989240ced9e92c3578894edb1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:12:37 +0200
Subject: [PATCH 51/57] R-cran-lazyeval: revbump for R-4.0.2

---
 srcpkgs/R-cran-lazyeval/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lazyeval/template b/srcpkgs/R-cran-lazyeval/template
index fad91bb02df..39c731f0d4c 100644
--- a/srcpkgs/R-cran-lazyeval/template
+++ b/srcpkgs/R-cran-lazyeval/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lazyeval'
 pkgname=R-cran-lazyeval
 version=0.2.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Lazy (Non-Standard) Evaluation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 02ec3605ccba2f23cfb88422e702ba7f8e688316 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:12:58 +0200
Subject: [PATCH 52/57] R-cran-labeling: revbump for R-4.0.2

---
 srcpkgs/R-cran-labeling/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index ba02bb27473..4ec70142e3d 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-labeling'
 pkgname=R-cran-labeling
 version=0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Axis Labeling"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 5b79004f44384237101c7e3e256d37837629d1ea Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:13:41 +0200
Subject: [PATCH 53/57] R-cran-gtable: revbump for R-4.0.2

---
 srcpkgs/R-cran-gtable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-gtable/template b/srcpkgs/R-cran-gtable/template
index 17402cef790..08cf057baf8 100644
--- a/srcpkgs/R-cran-gtable/template
+++ b/srcpkgs/R-cran-gtable/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-gtable'
 pkgname=R-cran-gtable
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Arrange 'Grobs' in Tables"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 736d8f8952eb6751c344edf3e8da29d01ca42592 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:14:28 +0200
Subject: [PATCH 54/57] R-cran-testthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-testthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-testthat/template b/srcpkgs/R-cran-testthat/template
index 32380062d9f..8e3b946f389 100644
--- a/srcpkgs/R-cran-testthat/template
+++ b/srcpkgs/R-cran-testthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-testthat'
 pkgname=R-cran-testthat
 version=2.3.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-digest R-cran-ellipsis
  R-cran-evaluate R-cran-magrittr R-cran-pkgload R-cran-praise R-cran-R6

From e12559ceda2971779032dcbb7125d0e52349850b Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:15:17 +0200
Subject: [PATCH 55/57] R-cran-isoband: revbump for R-4.0.2

---
 srcpkgs/R-cran-isoband/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index 58e2b9f16ef..651747354b4 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-isoband'
 pkgname=R-cran-isoband
 version=0.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-testthat"
 depends="R-cran-testthat"

From 3e02268eeab72add11ee469a956631b6bf084192 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:16:31 +0200
Subject: [PATCH 56/57] R-cran-ggplot2: revbump for R-4.0.2

---
 srcpkgs/R-cran-ggplot2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ebcea042a99..8ee6e36ae78 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
 version=3.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
  R-cran-rlang R-cran-scales R-cran-tibble R-cran-withr"

From ab1ab8b2dd0c0410d876d4581fd3f652ee8148eb Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:23:57 +0200
Subject: [PATCH 57/57] emacs-ess: revbump for R-4.0.2

---
 srcpkgs/emacs-ess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs-ess/template b/srcpkgs/emacs-ess/template
index 88bb906cbc5..40338f2f137 100644
--- a/srcpkgs/emacs-ess/template
+++ b/srcpkgs/emacs-ess/template
@@ -2,7 +2,7 @@
 pkgname=emacs-ess
 reverts="18.10r1_1"
 version=18.10.2
-revision=2
+revision=3
 archs=noarch
 create_wrksrc=yes
 build_wrksrc="ess-${version}"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (4 preceding siblings ...)
  2020-08-09 12:34 ` luhann
@ 2020-08-12 10:22 ` luhann
  2020-08-14 20:14 ` jnbr
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-12 10:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2650 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

Some R-cran-* packages failed xlint, so I've changed those where appropriate.

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [x] R-cran-backports
- [x] R-cran-callr
- [x] R-cran-cli
- [x] R-cran-colorspace
- [x] R-cran-crayon
- [x] R-cran-data.table
- [x] R-cran-desc
- [x] R-cran-dichromat
- [x] R-cran-digest
- [x] R-cran-ellipsis
- [x] R-cran-evaluate
- [x] R-cran-fansi
- [x] R-cran-farver
- [x] R-cran-generics
- [x] R-cran-ggplot2
- [x] R-cran-glue
- [x] R-cran-gsubfn
- [x] R-cran-gtable
- [x] R-cran-isoband
- [x] R-cran-labeling
- [x] R-cran-lazyeval
- [x] R-cran-lifecycle
- [x] R-cran-lubridate
- [x] R-cran-magrittr
- [x] R-cran-munsell
- [x] R-cran-nloptr
- [x] R-cran-pillar
- [x] R-cran-pkgbuild
- [x] R-cran-pkgconfig
- [x] R-cran-pkgload
- [x] R-cran-plyr
- [x] R-cran-praise
- [x] R-cran-prettyunits
- [x] R-cran-processx
- [x] R-cran-proto
- [x] R-cran-ps
- [x] R-cran-reshape2
- [x] R-cran-rlang
- [x] R-cran-rprojroot
- [x] R-cran-rstudioapi
- [x] R-cran-scales
- [x] R-cran-stringi
- [x] R-cran-stringr
- [x] R-cran-testthat
- [x] R-cran-tibble
- [x] R-cran-utf8
- [x] R-cran-vctrs
- [x] R-cran-viridisLite
- [x] R-cran-withr
- [x] R-cran-zeallot
- [x] R-cran-zoo
- [x] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 46196 bytes --]

From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 01/57] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index b10eae70847..4f1c94a8985 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2682,7 +2682,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From f15dacd2c0aa17065a8edfd98b8c71c2f0a7282d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 02/57] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 03/57] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 04/57] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 05/57] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From bd618f5ed70006509b8ad6704c5004dc980fac27 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:31:19 +0200
Subject: [PATCH 06/57] R-cran-backports: revbump for R-4.0.2

---
 srcpkgs/R-cran-backports/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 1afd87bb025..afd9a2913da 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-backports'
 pkgname=R-cran-backports
 version=1.1.8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://github.com/r-lib/backports"
 checksum=c661b271433338274c4140caf7cf8254f13f1b8870ace0e7e4917238044b2cc7

From 27dd562b46317a3a45df58ae4a321f5e7c2f7d06 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:19:58 +0200
Subject: [PATCH 07/57] R-cran-callr: revbump for R-4.0.2

---
 srcpkgs/R-cran-callr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 555e6b136f5..d20af5bff29 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"

From 6505f02d2f0fc7d023cd2b25af76dadb755ad2e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:11 +0200
Subject: [PATCH 08/57] R-cran-cli: revbump for R-4.0.2

---
 srcpkgs/R-cran-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index a995f5cce21..a37007c7325 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-cli'
 pkgname=R-cran-cli
 version=2.0.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"
 depends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"

From 14ae66e84ac1116dbbf8795edcdf6879a2d414f0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:17 +0200
Subject: [PATCH 09/57] R-cran-colorspace: revbump for R-4.0.2

---
 srcpkgs/R-cran-colorspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index c6c93ad6712..8490d34fdb5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-colorspace'
 pkgname=R-cran-colorspace
 version=1.4r1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 7ca6a7f876aee158af6e2e15fc67e2bda579d82c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:44 +0200
Subject: [PATCH 10/57] R-cran-processx: revbump for R-4.0.2

---
 srcpkgs/R-cran-processx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index cc17b164c7a..e051b4b3682 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"

From bb3ca95cfdd2c14d0cfe93303a97b92ab0d5ca53 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:50 +0200
Subject: [PATCH 11/57] R-cran-ps: update to 1.3.4.

---
 srcpkgs/R-cran-ps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index be89ddf72b4..1f95a5d7f2c 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,13 +1,13 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/r-lib/ps"
-checksum=03a45651538855be806e6dd9d731f101a6bbbd34162f887f9df69583f7fb20f4
+checksum=8468c6994e199053050c614fb3e6ee0e670833a0185abf53d6cb09e19c85aeb3
 
 post_install() {
 	vlicense LICENSE

From d4c021c08313b7129814c82a9d33215f009ce175 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:16 +0200
Subject: [PATCH 12/57] R-cran-crayon: revbump for R-4.0.2

---
 srcpkgs/R-cran-crayon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index e880df10155..7ccc8230501 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-crayon'
 pkgname=R-cran-crayon
 version=1.3.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From a4a9b81cfd2a003fd3a1cb5617057d54f1a5b365 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:48 +0200
Subject: [PATCH 13/57] R-cran-fansi: revbump for R-4.0.2

---
 srcpkgs/R-cran-fansi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 02201e3cb3b..23a088e6c89 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-fansi'
 pkgname=R-cran-fansi
 version=0.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 3df8a54a68bcd8e4dd0468ce6b2f005265c29e47 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:27:13 +0200
Subject: [PATCH 14/57] R-cran-glue: revbump for R-4.0.2

---
 srcpkgs/R-cran-glue/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 97dc31f7e17..48caa68cd5e 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-glue'
 pkgname=R-cran-glue
 version=1.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 1f9cec032e75e72a1f74370090fa217a8094570e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:06:44 +0200
Subject: [PATCH 15/57] R-cran-zoo: revbump for R-4.0.2

---
 srcpkgs/R-cran-zoo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index 12f7c4ed132..8b67dd292f5 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zoo'
 pkgname=R-cran-zoo
 version=1.8r8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 4399541cf1da63610d313259bb9c6250036fc6fc Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:07:25 +0200
Subject: [PATCH 16/57] R-cran-zeallot: revbump for R-4.0.2

---
 srcpkgs/R-cran-zeallot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 0cf9f1e40eb..1aa2d4ec911 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zeallot'
 pkgname=R-cran-zeallot
 version=0.1.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="John <me@johnnynator.dev>"

From a36aedb613eafdd2086976f26ca9785d889ef8b6 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:22 +0200
Subject: [PATCH 17/57] R-cran-withr: revbump for R-4.0.2

---
 srcpkgs/R-cran-withr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 25e2ed5fae6..b615b56ab15 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-withr'
 pkgname=R-cran-withr
 version=2.2.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 97dbf07a12ab49e31b4547e7a2ac049869c38a6b Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:56 +0200
Subject: [PATCH 18/57] R-cran-data.table: revbump for R-4.0.2

---
 srcpkgs/R-cran-data.table/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index b91448b2854..35159429af1 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-data.table'
 pkgname=R-cran-data.table
 version=1.13.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"

From 189e88a414b44c865ac753f8fc261e9d0b5c51d9 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:09:44 +0200
Subject: [PATCH 19/57] R-cran-desc: revbump for R-4.0.2

---
 srcpkgs/R-cran-desc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index f8ae4c1b793..8770cb9a55b 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-desc'
 pkgname=R-cran-desc
 version=1.2.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"

From 56be561d2ce143e410b2012e7baa5c0191169b3a Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:10:11 +0200
Subject: [PATCH 20/57] R-cran-rprojroot: revbump for R-4.0.2

---
 srcpkgs/R-cran-rprojroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 12227aba34a..8e92f0febfc 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rprojroot'
 pkgname=R-cran-rprojroot
 version=1.3r2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-backports"
 depends="R-cran-backports"

From f89830592e148f6c00fdee57b25215f17f1a1d28 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:12 +0200
Subject: [PATCH 21/57] R-cran-dichromat: revbump for R-4.0.2

---
 srcpkgs/R-cran-dichromat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 7e19fe6eded..6d4cbc2cc20 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-dichromat'
 pkgname=R-cran-dichromat
 version=2.0r0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/dichromat/"
 checksum=31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1

From 993155ca70a10e179d3e995d610c2afcbf0f2741 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:56 +0200
Subject: [PATCH 22/57] R-cran-digest: revbump for R-4.0.2

---
 srcpkgs/R-cran-digest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 8b0a3f04ba5..fd9b13fbce8 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-digest'
 pkgname=R-cran-digest
 version=0.6.25
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 0825d15d243e6e85b59cb36826100e5c6c274d00 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:12:53 +0200
Subject: [PATCH 23/57] R-cran-ellipsis: revbump for R-4.0.2

---
 srcpkgs/R-cran-ellipsis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 87d9baea125..f23754b7c8d 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ellipsis'
 pkgname=R-cran-ellipsis
 version=0.3.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"

From 8f684c920495da00ab95b8104b65a2cec645aa4f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:13:22 +0200
Subject: [PATCH 24/57] R-cran-rlang: revbump for R-4.0.2

---
 srcpkgs/R-cran-rlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index a751bc3dfbd..33e1d96c82f 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rlang'
 pkgname=R-cran-rlang
 version=0.4.7
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 556093920a43e635bbd9ded3b451faa6f918c266 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:16:55 +0200
Subject: [PATCH 25/57] R-cran-evaluate: revbump for R-4.0.2

---
 srcpkgs/R-cran-evaluate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index aa50c05d3d9..2f780356316 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-evaluate'
 pkgname=R-cran-evaluate
 version=0.14
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"

From f0da51b934c95d45d95425d0b3ebbf79bea8e5ca Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:11:25 +0200
Subject: [PATCH 26/57] R-cran-proto: revbump for R-4.0.2

---
 srcpkgs/R-cran-proto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index eb94bbb2392..e06c26391f1 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-proto'
 pkgname=R-cran-proto
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/hadley/proto"
 checksum=9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1

From 15c1682267a065e6ce3ded8e82109cafb3d80e3f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:12:28 +0200
Subject: [PATCH 27/57] R-cran-gsubfn: revbump for R-4.0.2

---
 srcpkgs/R-cran-gsubfn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 5f45a42c0d8..5d65a853312 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-gsubfn'
 pkgname=R-cran-gsubfn
 version=0.7
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-proto"
-makedepends+=" R-cran-proto"
+makedepends="R-cran-proto"
+depends="R-cran-proto"
 short_desc="Utilities for strings and function arguments"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"

From add11978e258aeebfefcf872005cbff9b0cafdf2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:14:36 +0200
Subject: [PATCH 28/57] R-cran-farver: revbump for R-4.0.2

---
 srcpkgs/R-cran-farver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 84c20c060f5..43c6b2c6362 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-farver'
 pkgname=R-cran-farver
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="High Performance Colour Space Manipulation"
 maintainer="John <me@johnnynator.dev>"

From c17554c4331f8972b23caf30a7d758e6d0812efc Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:14 +0200
Subject: [PATCH 29/57] R-cran-viridisLite: revbump for R-4.0.2

---
 srcpkgs/R-cran-viridisLite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index 621dbedde25..c0b75985997 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-viridisLite'
 pkgname=R-cran-viridisLite
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From c187b89071357b4295e65a6f86a1e0a03f96ef42 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:50 +0200
Subject: [PATCH 30/57] R-cran-vctrs: revbump for R-4.0.2

---
 srcpkgs/R-cran-vctrs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 6842bdc0003..117a41b16c0 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-vctrs'
 pkgname=R-cran-vctrs
 version=0.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"

From 51b62f81d0d20c40e03cf6c9a05a7346de510a08 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:34:56 +0200
Subject: [PATCH 31/57] R-cran-utf8: revbump for R-4.0.2

---
 srcpkgs/R-cran-utf8/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index d3da68930bb..55923b13fa5 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -1,14 +1,10 @@
 # Template file for 'R-cran-utf8'
 pkgname=R-cran-utf8
 version=1.1.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
 homepage="https://github.com/patperry/r-utf8/"
 checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
-
-post_install() {
-	vlicense LICENSE
-}

From a2926143dc9eb7a302cba481d5f5b07510af1bf1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:02 +0200
Subject: [PATCH 32/57] R-cran-tibble: revbump for R-4.0.2

---
 srcpkgs/R-cran-tibble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 7208b4e07b4..6e5300749c2 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-tibble'
 pkgname=R-cran-tibble
 version=3.0.3
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis
  R-cran-fansi R-cran-lifecycle R-cran-magrittr

From 9d07794e76b41e86e5f2f2af533cfd2f210a0ac6 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:47 +0200
Subject: [PATCH 33/57] R-cran-lifecycle: revbump for R-4.0.2

---
 srcpkgs/R-cran-lifecycle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index efe7780af57..895a649705f 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lifecycle'
 pkgname=R-cran-lifecycle
 version=0.2.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"

From cf00466a5637f62a8041c28e4bf2f9a02157135f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:39:25 +0200
Subject: [PATCH 34/57] R-cran-magrittr: revbump for R-4.0.2

---
 srcpkgs/R-cran-magrittr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index d180b2d661d..44af2806c82 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -1,9 +1,9 @@
 # Template file for 'R-cran-magrittr'
 pkgname=R-cran-magrittr
 version=1.5
-revision=1
+revision=2
 build_style=R-cran
-short_desc="A Forward-Pipe Operator for R"
+short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/magrittr/index.html"

From 7008dd233de448af98fd79586a103f338002b783 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:04 +0200
Subject: [PATCH 35/57] R-cran-pillar: revbump for R-4.0.2

---
 srcpkgs/R-cran-pillar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index 363430a948e..66a4da300d7 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pillar'
 pkgname=R-cran-pillar
 version=1.4.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-lifecycle R-cran-rlang R-cran-utf8
  R-cran-fansi R-cran-vctrs"

From a2e24c4723313328168548b0ada2070c1b27477c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:44 +0200
Subject: [PATCH 36/57] R-cran-pkgconfig: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index dfa28b1b3bb..5d96a44beca 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgconfig'
 pkgname=R-cran-pkgconfig
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"

From e2f080746b266b1cfabb7ed032b3b7ecc9a09839 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:34 +0200
Subject: [PATCH 37/57] R-cran-nloptr: revbump for R-4.0.2

---
 srcpkgs/R-cran-nloptr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index e29693f7971..aff2a57da94 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-nloptr'
 pkgname=R-cran-nloptr
 version=1.2.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="pkg-config"
 makedepends="nlopt-devel"

From 0fc83ae68df4e59449523e693cbfa29d6049342e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:52 +0200
Subject: [PATCH 38/57] R-cran-munsell: revbump for R-4.0.2

---
 srcpkgs/R-cran-munsell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index f4c54b04962..79dfa4ee3be 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-munsell'
 pkgname=R-cran-munsell
 version=0.5.0
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-colorspace"
-makedepends+=" R-cran-colorspace"
+makedepends="R-cran-colorspace"
+depends="R-cran-colorspace"
 short_desc="Utilities for Using Munsell Colours"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"

From 9d7355d82844210ca85ef17072ca92a572b464b9 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:47:42 +0200
Subject: [PATCH 39/57] R-cran-generics: revbump for R-4.0.2

---
 srcpkgs/R-cran-generics/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 080a9086537..d35b29a6a34 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-generics'
 pkgname=R-cran-generics
 version=0.0.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"

From d6c745650a2d8af20b8633e0d551b8bc8e235589 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:48:26 +0200
Subject: [PATCH 40/57] R-cran-praise: revbump for R-4.0.2

---
 srcpkgs/R-cran-praise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index 0be89154fdd..99bf129de0e 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-praise'
 pkgname=R-cran-praise
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 2580ccee6fb44c6edf6261a5083702feb64b6b5d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:06 +0200
Subject: [PATCH 41/57] R-cran-prettyunits: revbump for R-4.0.2

---
 srcpkgs/R-cran-prettyunits/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 08ee698869e..918a4da4ea8 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-prettyunits'
 pkgname=R-cran-prettyunits
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From bc83a7a0360d480c4982d217c06d772918848aa5 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:47 +0200
Subject: [PATCH 42/57] R-cran-reshape2: revbump for R-4.0.2

---
 srcpkgs/R-cran-reshape2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index dc30c03cf1c..fbc8a6b6aa9 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-reshape2'
 pkgname=R-cran-reshape2
 version=1.4.4
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-plyr R-cran-stringr R-cran-Rcpp"
 depends="R-cran-plyr>=1.8.1 R-cran-stringr R-cran-Rcpp"

From 289aaf75b60ff2e17bfbeadd603aed0fce717364 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:51:34 +0200
Subject: [PATCH 43/57] R-cran-plyr: revbump for R-4.0.2

---
 srcpkgs/R-cran-plyr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index 3775dc999ad..c046ee5601c 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-plyr'
 pkgname=R-cran-plyr
 version=1.8.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-Rcpp"
 depends="R-cran-Rcpp>=0.11.0"

From fab802ad7e73afada84a3cac4317da07076e5bbd Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:52:24 +0200
Subject: [PATCH 44/57] R-cran-stringr: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index e11de59085c..9c4c5ffa24b 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringr'
 pkgname=R-cran-stringr
 version=1.4.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-stringi R-cran-magrittr R-cran-glue"
 depends="R-cran-stringi>=1.1.7 R-cran-magrittr R-cran-glue>=1.2.0"

From 1f79025561d1f09c932cf8c3f8fdf6dbd299d6a7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:53:16 +0200
Subject: [PATCH 45/57] R-cran-stringi: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index fc2bddc2e02..b7420242f6a 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.4.6
-revision=2
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From b2919f52072ebc1b43f4f85fd31d437deabce229 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:04:25 +0200
Subject: [PATCH 46/57] R-cran-rstudioapi: revbump for R-4.0.2

---
 srcpkgs/R-cran-rstudioapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index 22dff81e6da..834afe66f5f 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rstudioapi'
 pkgname=R-cran-rstudioapi
 version=0.11
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 7368b9ca992fa01ac85f946299e2a858eadcdaa5 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:06:24 +0200
Subject: [PATCH 47/57] R-cran-pkgbuild: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgbuild/template b/srcpkgs/R-cran-pkgbuild/template
index 333e2dc440e..539be556b82 100644
--- a/srcpkgs/R-cran-pkgbuild/template
+++ b/srcpkgs/R-cran-pkgbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgbuild'
 pkgname=R-cran-pkgbuild
 version=1.1.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-callr R-cran-cli R-cran-crayon R-cran-desc
  R-cran-prettyunits R-cran-R6 R-cran-rprojroot R-cran-withr"

From 056125fc500f0ac909274d017f1662dffa293676 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:07:08 +0200
Subject: [PATCH 48/57] R-cran-pkgload: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgload/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgload/template b/srcpkgs/R-cran-pkgload/template
index 1c19bfcf74e..b4ee55f56b3 100644
--- a/srcpkgs/R-cran-pkgload/template
+++ b/srcpkgs/R-cran-pkgload/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgload'
 pkgname=R-cran-pkgload
 version=1.1.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-desc R-cran-pkgbuild
  R-cran-rlang R-cran-rprojroot R-cran-rstudioapi R-cran-withr"

From b0255c8a9b1dea67c85c62c3f0baa86e339beef1 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:10:19 +0200
Subject: [PATCH 49/57] R-cran-scales: revbump for R-4.0.2

---
 srcpkgs/R-cran-scales/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template
index 59d94fe7c63..c4dec24cdbc 100644
--- a/srcpkgs/R-cran-scales/template
+++ b/srcpkgs/R-cran-scales/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-scales'
 pkgname=R-cran-scales
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-RColorBrewer R-cran-farver
  R-cran-munsell R-cran-labeling R-cran-R6

From ae0f16e8107afac66ad749a47afa3f5a430545ca Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:11:29 +0200
Subject: [PATCH 50/57] R-cran-lubridate: revbump for R-4.0.2

---
 srcpkgs/R-cran-lubridate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lubridate/template b/srcpkgs/R-cran-lubridate/template
index 3a6e7e93250..76601e943c2 100644
--- a/srcpkgs/R-cran-lubridate/template
+++ b/srcpkgs/R-cran-lubridate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lubridate'
 pkgname=R-cran-lubridate
 version=1.7.9
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-generics R-cran-Rcpp"
 depends="R-cran-generics R-cran-Rcpp>=0.12.13"

From 8f949f1ba0cf346ea9ff3c4857f355d2f934a6ad Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:12:37 +0200
Subject: [PATCH 51/57] R-cran-lazyeval: revbump for R-4.0.2

---
 srcpkgs/R-cran-lazyeval/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lazyeval/template b/srcpkgs/R-cran-lazyeval/template
index fad91bb02df..39c731f0d4c 100644
--- a/srcpkgs/R-cran-lazyeval/template
+++ b/srcpkgs/R-cran-lazyeval/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lazyeval'
 pkgname=R-cran-lazyeval
 version=0.2.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Lazy (Non-Standard) Evaluation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From a3f7e8ca0acd739ba3dd38b2c7ee53b296db21a4 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:12:58 +0200
Subject: [PATCH 52/57] R-cran-labeling: revbump for R-4.0.2

---
 srcpkgs/R-cran-labeling/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index ba02bb27473..4ec70142e3d 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-labeling'
 pkgname=R-cran-labeling
 version=0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Axis Labeling"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From ecc84a623518753d76b37b1e585e55e64983ca0c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:13:41 +0200
Subject: [PATCH 53/57] R-cran-gtable: revbump for R-4.0.2

---
 srcpkgs/R-cran-gtable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-gtable/template b/srcpkgs/R-cran-gtable/template
index 17402cef790..08cf057baf8 100644
--- a/srcpkgs/R-cran-gtable/template
+++ b/srcpkgs/R-cran-gtable/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-gtable'
 pkgname=R-cran-gtable
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Arrange 'Grobs' in Tables"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 9dd34d6952caa50dd1a23d64ea1a168b94242af3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:14:28 +0200
Subject: [PATCH 54/57] R-cran-testthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-testthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-testthat/template b/srcpkgs/R-cran-testthat/template
index 32380062d9f..8e3b946f389 100644
--- a/srcpkgs/R-cran-testthat/template
+++ b/srcpkgs/R-cran-testthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-testthat'
 pkgname=R-cran-testthat
 version=2.3.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-digest R-cran-ellipsis
  R-cran-evaluate R-cran-magrittr R-cran-pkgload R-cran-praise R-cran-R6

From 08fd7409dce36ba702c79d8b536d440b5fc45d1f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:15:17 +0200
Subject: [PATCH 55/57] R-cran-isoband: revbump for R-4.0.2

---
 srcpkgs/R-cran-isoband/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index 58e2b9f16ef..651747354b4 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-isoband'
 pkgname=R-cran-isoband
 version=0.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-testthat"
 depends="R-cran-testthat"

From 30a85a3e06dff9aeeb57f6e8bf610565eabb1f85 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:16:31 +0200
Subject: [PATCH 56/57] R-cran-ggplot2: revbump for R-4.0.2

---
 srcpkgs/R-cran-ggplot2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ebcea042a99..8ee6e36ae78 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
 version=3.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
  R-cran-rlang R-cran-scales R-cran-tibble R-cran-withr"

From f409c15b1de1decb77ba7a9c2422fc797eb156fc Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:23:57 +0200
Subject: [PATCH 57/57] emacs-ess: revbump for R-4.0.2

---
 srcpkgs/emacs-ess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs-ess/template b/srcpkgs/emacs-ess/template
index 88bb906cbc5..40338f2f137 100644
--- a/srcpkgs/emacs-ess/template
+++ b/srcpkgs/emacs-ess/template
@@ -2,7 +2,7 @@
 pkgname=emacs-ess
 reverts="18.10r1_1"
 version=18.10.2
-revision=2
+revision=3
 archs=noarch
 create_wrksrc=yes
 build_wrksrc="ess-${version}"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (5 preceding siblings ...)
  2020-08-12 10:22 ` [PR PATCH] [Updated] " luhann
@ 2020-08-14 20:14 ` jnbr
  2020-08-14 21:19 ` [PR PATCH] [Updated] " luhann
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: jnbr @ 2020-08-14 20:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/24126#issuecomment-674253954

Comment:
Thank you for your work on this.
Is it ready for merging? If so, please rebase.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (6 preceding siblings ...)
  2020-08-14 20:14 ` jnbr
@ 2020-08-14 21:19 ` luhann
  2020-08-14 21:19 ` luhann
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-14 21:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2650 bytes --]

There is an updated pull request by luhann against master on the void-packages repository

https://github.com/luhann/void-packages R
https://github.com/void-linux/void-packages/pull/24126

R: update to 4.0.2.
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

Some R-cran-* packages failed xlint, so I've changed those where appropriate.

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [x] R-cran-backports
- [x] R-cran-callr
- [x] R-cran-cli
- [x] R-cran-colorspace
- [x] R-cran-crayon
- [x] R-cran-data.table
- [x] R-cran-desc
- [x] R-cran-dichromat
- [x] R-cran-digest
- [x] R-cran-ellipsis
- [x] R-cran-evaluate
- [x] R-cran-fansi
- [x] R-cran-farver
- [x] R-cran-generics
- [x] R-cran-ggplot2
- [x] R-cran-glue
- [x] R-cran-gsubfn
- [x] R-cran-gtable
- [x] R-cran-isoband
- [x] R-cran-labeling
- [x] R-cran-lazyeval
- [x] R-cran-lifecycle
- [x] R-cran-lubridate
- [x] R-cran-magrittr
- [x] R-cran-munsell
- [x] R-cran-nloptr
- [x] R-cran-pillar
- [x] R-cran-pkgbuild
- [x] R-cran-pkgconfig
- [x] R-cran-pkgload
- [x] R-cran-plyr
- [x] R-cran-praise
- [x] R-cran-prettyunits
- [x] R-cran-processx
- [x] R-cran-proto
- [x] R-cran-ps
- [x] R-cran-reshape2
- [x] R-cran-rlang
- [x] R-cran-rprojroot
- [x] R-cran-rstudioapi
- [x] R-cran-scales
- [x] R-cran-stringi
- [x] R-cran-stringr
- [x] R-cran-testthat
- [x] R-cran-tibble
- [x] R-cran-utf8
- [x] R-cran-vctrs
- [x] R-cran-viridisLite
- [x] R-cran-withr
- [x] R-cran-zeallot
- [x] R-cran-zoo
- [x] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


A patch file from https://github.com/void-linux/void-packages/pull/24126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-24126.patch --]
[-- Type: text/x-diff, Size: 46196 bytes --]

From 9102ab56be3caa91f08cc14f1f754c29b6ac9fd3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 12:27:09 +0200
Subject: [PATCH 01/57] R: update to 4.0.2.

---
 common/shlibs               |  2 +-
 srcpkgs/R/patches/ppc.patch | 33 ---------------------------------
 srcpkgs/R/template          | 11 ++++++-----
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/R/patches/ppc.patch

diff --git a/common/shlibs b/common/shlibs
index 2a6f351fb2d..7d8cd9e0245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2679,7 +2679,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
 libedac.so.1 libedac-0.18_1
 libxlsreader.so.1 libxls-1.4.0_1
-libR.so R-3.3.0_2
+libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
diff --git a/srcpkgs/R/patches/ppc.patch b/srcpkgs/R/patches/ppc.patch
deleted file mode 100644
index f8c6faba4a3..00000000000
--- a/srcpkgs/R/patches/ppc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Wed, 25 Mar 2020 09:06:23 +0000
-Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
-
-git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- src/main/arithmetic.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
-index fc7496a8908..196431c7675 100644
---- src/main/arithmetic.c
-+++ src/main/arithmetic.c
-@@ -1,6 +1,6 @@
- /*
-  *  R : A Computer Language for Statistical Data Analysis
-- *  Copyright (C) 1998--2019 The R Core Team.
-+ *  Copyright (C) 1998--2020 The R Core Team.
-  *  Copyright (C) 2003--2019 The R Foundation
-  *  Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
-  *
-@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
- 
- 
- #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
--# ifdef __PPC64__
-+# ifdef __powerpc__
-  // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
-+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
- #  define q_1_eps (1 / LDBL_EPSILON)
- # else
- static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 424154fad12..47bee4dabe0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,15 +1,16 @@
 # Template file for 'R'
 pkgname=R
-version=3.6.3
-revision=2
+version=4.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
+ lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
  libcurl-devel tcl-devel tk-devel libxml2-devel"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
@@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
-distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f
+distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
+checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
 nocross=yes
 shlib_provides="libR.so"
 

From 0ad938fd93c3e7cf37d4534af89bc0fdab2f5071 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:06:23 +0200
Subject: [PATCH 02/57] R-cran-R6: revbump for R-4.0.2

---
 srcpkgs/R-cran-R6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 70e4b9776bb..8c06f5a3cf7 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
 version=2.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From d26c862cc73e8842aa25cc95db2176a131049064 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:08:49 +0200
Subject: [PATCH 03/57] R-cran-RColorBrewer: revbump for R-4.0.2

---
 srcpkgs/R-cran-RColorBrewer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 6f905881c29..b64c8bcf5da 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-RColorBrewer'
 pkgname=R-cran-RColorBrewer
 version=1.1r2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 6b0a6f6fec7cf2c9d52df5e4f2633536d4bad577 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:11:16 +0200
Subject: [PATCH 04/57] R-cran-Rcpp: revbump for R-4.0.2

---
 srcpkgs/R-cran-Rcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 7cee0242095..e19cd395809 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-Rcpp'
 pkgname=R-cran-Rcpp
 version=1.0.5
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From e933ef33dcdcf59f208c169110e5ea8321fa6eb7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:20:17 +0200
Subject: [PATCH 05/57] R-cran-assertthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-assertthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 83d44266c0e..6e8161baa7d 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-assertthat'
 pkgname=R-cran-assertthat
 version=0.2.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 112d489b7016881b81c771da3ac9853ef8b00c05 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 14:31:19 +0200
Subject: [PATCH 06/57] R-cran-backports: revbump for R-4.0.2

---
 srcpkgs/R-cran-backports/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 1afd87bb025..afd9a2913da 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-backports'
 pkgname=R-cran-backports
 version=1.1.8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://github.com/r-lib/backports"
 checksum=c661b271433338274c4140caf7cf8254f13f1b8870ace0e7e4917238044b2cc7

From f6907818dc3d6c5b4487718355d1f457d35cea0c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:19:58 +0200
Subject: [PATCH 07/57] R-cran-callr: revbump for R-4.0.2

---
 srcpkgs/R-cran-callr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 555e6b136f5..d20af5bff29 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"

From 2fd829cd3d6bf92da8b5e4910a2c0c48e05bf8b6 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:11 +0200
Subject: [PATCH 08/57] R-cran-cli: revbump for R-4.0.2

---
 srcpkgs/R-cran-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index a995f5cce21..a37007c7325 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-cli'
 pkgname=R-cran-cli
 version=2.0.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"
 depends="R-cran-assertthat R-cran-crayon R-cran-fansi R-cran-glue"

From f263170254de8c9b7a1ec6dbffbad2d69a2aeebd Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:20:17 +0200
Subject: [PATCH 09/57] R-cran-colorspace: revbump for R-4.0.2

---
 srcpkgs/R-cran-colorspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index c6c93ad6712..8490d34fdb5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-colorspace'
 pkgname=R-cran-colorspace
 version=1.4r1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 8497467a9652a26b98b2ffdb177544d40af74c3c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:44 +0200
Subject: [PATCH 10/57] R-cran-processx: revbump for R-4.0.2

---
 srcpkgs/R-cran-processx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index cc17b164c7a..e051b4b3682 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
 version=3.4.3
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"

From a2bcfba4848cbd052657de150b5d2769cd68af73 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:21:50 +0200
Subject: [PATCH 11/57] R-cran-ps: update to 1.3.4.

---
 srcpkgs/R-cran-ps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index be89ddf72b4..1f95a5d7f2c 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,13 +1,13 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/r-lib/ps"
-checksum=03a45651538855be806e6dd9d731f101a6bbbd34162f887f9df69583f7fb20f4
+checksum=8468c6994e199053050c614fb3e6ee0e670833a0185abf53d6cb09e19c85aeb3
 
 post_install() {
 	vlicense LICENSE

From 6f193c37d13e154c68bc396f0d0344382a8a074c Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:16 +0200
Subject: [PATCH 12/57] R-cran-crayon: revbump for R-4.0.2

---
 srcpkgs/R-cran-crayon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index e880df10155..7ccc8230501 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-crayon'
 pkgname=R-cran-crayon
 version=1.3.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 01ebbc4f42dcdff0ae94baf375989c3e2f72af2a Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:24:48 +0200
Subject: [PATCH 13/57] R-cran-fansi: revbump for R-4.0.2

---
 srcpkgs/R-cran-fansi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 02201e3cb3b..23a088e6c89 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-fansi'
 pkgname=R-cran-fansi
 version=0.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 92be626cca1a0ed869c18a01a94367c05e4da8d5 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 15:27:13 +0200
Subject: [PATCH 14/57] R-cran-glue: revbump for R-4.0.2

---
 srcpkgs/R-cran-glue/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 97dc31f7e17..48caa68cd5e 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-glue'
 pkgname=R-cran-glue
 version=1.4.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From a826fb31cdc0b8fc89467c82ef6aa4a83fdee6ab Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:06:44 +0200
Subject: [PATCH 15/57] R-cran-zoo: revbump for R-4.0.2

---
 srcpkgs/R-cran-zoo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index 12f7c4ed132..8b67dd292f5 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zoo'
 pkgname=R-cran-zoo
 version=1.8r8
-revision=1
+revision=2
 build_style=R-cran
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 3715084e5696acc3f6d611283e01cd56f48a2b56 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:07:25 +0200
Subject: [PATCH 16/57] R-cran-zeallot: revbump for R-4.0.2

---
 srcpkgs/R-cran-zeallot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 0cf9f1e40eb..1aa2d4ec911 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-zeallot'
 pkgname=R-cran-zeallot
 version=0.1.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="John <me@johnnynator.dev>"

From b6a80ff79eef5b6b90e7ca6bfea907e6a6b2265f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:22 +0200
Subject: [PATCH 17/57] R-cran-withr: revbump for R-4.0.2

---
 srcpkgs/R-cran-withr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 25e2ed5fae6..b615b56ab15 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-withr'
 pkgname=R-cran-withr
 version=2.2.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From aa0843a7f52e728f5331a8619d77d67ae828a459 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:08:56 +0200
Subject: [PATCH 18/57] R-cran-data.table: revbump for R-4.0.2

---
 srcpkgs/R-cran-data.table/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index b91448b2854..35159429af1 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-data.table'
 pkgname=R-cran-data.table
 version=1.13.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"

From 055990084529d91bb4d1d9a8b9abdc104d606150 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:09:44 +0200
Subject: [PATCH 19/57] R-cran-desc: revbump for R-4.0.2

---
 srcpkgs/R-cran-desc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index f8ae4c1b793..8770cb9a55b 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-desc'
 pkgname=R-cran-desc
 version=1.2.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"

From 0d1d6702e36d5c7546b6ff10d4547a923f3c30b3 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:10:11 +0200
Subject: [PATCH 20/57] R-cran-rprojroot: revbump for R-4.0.2

---
 srcpkgs/R-cran-rprojroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 12227aba34a..8e92f0febfc 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rprojroot'
 pkgname=R-cran-rprojroot
 version=1.3r2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-backports"
 depends="R-cran-backports"

From 91ea71bf41417d915bef1c8fa55443ab20e93831 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:12 +0200
Subject: [PATCH 21/57] R-cran-dichromat: revbump for R-4.0.2

---
 srcpkgs/R-cran-dichromat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 7e19fe6eded..6d4cbc2cc20 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-dichromat'
 pkgname=R-cran-dichromat
 version=2.0r0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/dichromat/"
 checksum=31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1

From 2eac0c198745c6b25625ab30a48e4cb21f4003de Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:11:56 +0200
Subject: [PATCH 22/57] R-cran-digest: revbump for R-4.0.2

---
 srcpkgs/R-cran-digest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 8b0a3f04ba5..fd9b13fbce8 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-digest'
 pkgname=R-cran-digest
 version=0.6.25
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 018a3e024536c7762b911ddd8b07de9d85586afe Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:12:53 +0200
Subject: [PATCH 23/57] R-cran-ellipsis: revbump for R-4.0.2

---
 srcpkgs/R-cran-ellipsis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 87d9baea125..f23754b7c8d 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ellipsis'
 pkgname=R-cran-ellipsis
 version=0.3.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"

From d7a192bee19434fc0d00c925a9d25597e5d87919 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:13:22 +0200
Subject: [PATCH 24/57] R-cran-rlang: revbump for R-4.0.2

---
 srcpkgs/R-cran-rlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index a751bc3dfbd..33e1d96c82f 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rlang'
 pkgname=R-cran-rlang
 version=0.4.7
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 80b05609cff7842d2a566ec34050fa43959f6342 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 17:16:55 +0200
Subject: [PATCH 25/57] R-cran-evaluate: revbump for R-4.0.2

---
 srcpkgs/R-cran-evaluate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index aa50c05d3d9..2f780356316 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-evaluate'
 pkgname=R-cran-evaluate
 version=0.14
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"

From 30738b94c00ff9c093f54a0ce29c7636dba17d63 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:11:25 +0200
Subject: [PATCH 26/57] R-cran-proto: revbump for R-4.0.2

---
 srcpkgs/R-cran-proto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index eb94bbb2392..e06c26391f1 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-proto'
 pkgname=R-cran-proto
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/hadley/proto"
 checksum=9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1

From e2eefb5b3a1be866d8f9489f5c972e16fee09b68 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:12:28 +0200
Subject: [PATCH 27/57] R-cran-gsubfn: revbump for R-4.0.2

---
 srcpkgs/R-cran-gsubfn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 5f45a42c0d8..5d65a853312 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-gsubfn'
 pkgname=R-cran-gsubfn
 version=0.7
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-proto"
-makedepends+=" R-cran-proto"
+makedepends="R-cran-proto"
+depends="R-cran-proto"
 short_desc="Utilities for strings and function arguments"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"

From de899cbf0307829eb077aea3b97096ba879d5193 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 18:14:36 +0200
Subject: [PATCH 28/57] R-cran-farver: revbump for R-4.0.2

---
 srcpkgs/R-cran-farver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 84c20c060f5..43c6b2c6362 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-farver'
 pkgname=R-cran-farver
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="High Performance Colour Space Manipulation"
 maintainer="John <me@johnnynator.dev>"

From dc9a5eedb79cbc318271ca6a2096a57d3b2ea165 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:14 +0200
Subject: [PATCH 29/57] R-cran-viridisLite: revbump for R-4.0.2

---
 srcpkgs/R-cran-viridisLite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index 621dbedde25..c0b75985997 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-viridisLite'
 pkgname=R-cran-viridisLite
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 04ff648e70c626678d6d469df50fc884887370f8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:33:50 +0200
Subject: [PATCH 30/57] R-cran-vctrs: revbump for R-4.0.2

---
 srcpkgs/R-cran-vctrs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 6842bdc0003..117a41b16c0 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-vctrs'
 pkgname=R-cran-vctrs
 version=0.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"

From 06e80d7201e634a46e83e85faaa1f88e2b4f43ef Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:34:56 +0200
Subject: [PATCH 31/57] R-cran-utf8: revbump for R-4.0.2

---
 srcpkgs/R-cran-utf8/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index d3da68930bb..55923b13fa5 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -1,14 +1,10 @@
 # Template file for 'R-cran-utf8'
 pkgname=R-cran-utf8
 version=1.1.4
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
 homepage="https://github.com/patperry/r-utf8/"
 checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
-
-post_install() {
-	vlicense LICENSE
-}

From c1a51ee2df406cb42078260be853c510c73796b8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:02 +0200
Subject: [PATCH 32/57] R-cran-tibble: revbump for R-4.0.2

---
 srcpkgs/R-cran-tibble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 7208b4e07b4..6e5300749c2 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-tibble'
 pkgname=R-cran-tibble
 version=3.0.3
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis
  R-cran-fansi R-cran-lifecycle R-cran-magrittr

From 5e5094b47349b0a1c1f887e6ab08b48824c83005 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:37:47 +0200
Subject: [PATCH 33/57] R-cran-lifecycle: revbump for R-4.0.2

---
 srcpkgs/R-cran-lifecycle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index efe7780af57..895a649705f 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lifecycle'
 pkgname=R-cran-lifecycle
 version=0.2.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"

From 3fa3869b6aa86517ddb28745c25af9873067cef0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:39:25 +0200
Subject: [PATCH 34/57] R-cran-magrittr: revbump for R-4.0.2

---
 srcpkgs/R-cran-magrittr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index d180b2d661d..44af2806c82 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -1,9 +1,9 @@
 # Template file for 'R-cran-magrittr'
 pkgname=R-cran-magrittr
 version=1.5
-revision=1
+revision=2
 build_style=R-cran
-short_desc="A Forward-Pipe Operator for R"
+short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/magrittr/index.html"

From 54fa8297fa287af6ddcf201801d60e3dbda1d825 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:04 +0200
Subject: [PATCH 35/57] R-cran-pillar: revbump for R-4.0.2

---
 srcpkgs/R-cran-pillar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index 363430a948e..66a4da300d7 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pillar'
 pkgname=R-cran-pillar
 version=1.4.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-lifecycle R-cran-rlang R-cran-utf8
  R-cran-fansi R-cran-vctrs"

From 080b90fb5f2e6af86389c70f8ed724737537c539 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:41:44 +0200
Subject: [PATCH 36/57] R-cran-pkgconfig: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index dfa28b1b3bb..5d96a44beca 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgconfig'
 pkgname=R-cran-pkgconfig
 version=2.0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"

From 840305fef9f99f8508edf9f106f8775a3034350b Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:34 +0200
Subject: [PATCH 37/57] R-cran-nloptr: revbump for R-4.0.2

---
 srcpkgs/R-cran-nloptr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index e29693f7971..aff2a57da94 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-nloptr'
 pkgname=R-cran-nloptr
 version=1.2.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="pkg-config"
 makedepends="nlopt-devel"

From c08082aaefc49a452ed634be73ad605a0fb0c79f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:44:52 +0200
Subject: [PATCH 38/57] R-cran-munsell: revbump for R-4.0.2

---
 srcpkgs/R-cran-munsell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index f4c54b04962..79dfa4ee3be 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-munsell'
 pkgname=R-cran-munsell
 version=0.5.0
-revision=1
+revision=2
 build_style=R-cran
-depends+=" R-cran-colorspace"
-makedepends+=" R-cran-colorspace"
+makedepends="R-cran-colorspace"
+depends="R-cran-colorspace"
 short_desc="Utilities for Using Munsell Colours"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"

From ad4efff3c2296fe03a117aac0f9c262d16a028b2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:47:42 +0200
Subject: [PATCH 39/57] R-cran-generics: revbump for R-4.0.2

---
 srcpkgs/R-cran-generics/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 080a9086537..d35b29a6a34 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-generics'
 pkgname=R-cran-generics
 version=0.0.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"

From 0f98a54b5a139b167d2bd8bb52ba9fe5dc4edae2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:48:26 +0200
Subject: [PATCH 40/57] R-cran-praise: revbump for R-4.0.2

---
 srcpkgs/R-cran-praise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index 0be89154fdd..99bf129de0e 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-praise'
 pkgname=R-cran-praise
 version=1.0.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 3abf4dfda56045cd4cfaade3f0f35a10f449b221 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:06 +0200
Subject: [PATCH 41/57] R-cran-prettyunits: revbump for R-4.0.2

---
 srcpkgs/R-cran-prettyunits/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 08ee698869e..918a4da4ea8 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-prettyunits'
 pkgname=R-cran-prettyunits
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From e469adcbbbd814f96122876c6c37385d16da811d Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:50:47 +0200
Subject: [PATCH 42/57] R-cran-reshape2: revbump for R-4.0.2

---
 srcpkgs/R-cran-reshape2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index dc30c03cf1c..fbc8a6b6aa9 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-reshape2'
 pkgname=R-cran-reshape2
 version=1.4.4
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-plyr R-cran-stringr R-cran-Rcpp"
 depends="R-cran-plyr>=1.8.1 R-cran-stringr R-cran-Rcpp"

From 313b345f47d26bc878d8a195962c46f9085b7a29 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:51:34 +0200
Subject: [PATCH 43/57] R-cran-plyr: revbump for R-4.0.2

---
 srcpkgs/R-cran-plyr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index 3775dc999ad..c046ee5601c 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-plyr'
 pkgname=R-cran-plyr
 version=1.8.6
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-Rcpp"
 depends="R-cran-Rcpp>=0.11.0"

From 2be88cfe81083365a7fa837c722a21d26d1e8395 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:52:24 +0200
Subject: [PATCH 44/57] R-cran-stringr: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index e11de59085c..9c4c5ffa24b 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringr'
 pkgname=R-cran-stringr
 version=1.4.0
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-stringi R-cran-magrittr R-cran-glue"
 depends="R-cran-stringi>=1.1.7 R-cran-magrittr R-cran-glue>=1.2.0"

From c7972eb4c4f2220a548610fb5fc7c13cede9b8fa Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 7 Aug 2020 23:53:16 +0200
Subject: [PATCH 45/57] R-cran-stringi: revbump for R-4.0.2

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index fc2bddc2e02..b7420242f6a 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.4.6
-revision=2
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From 7729470cacc10decd801863c6913c9f35b6785ea Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:04:25 +0200
Subject: [PATCH 46/57] R-cran-rstudioapi: revbump for R-4.0.2

---
 srcpkgs/R-cran-rstudioapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index 22dff81e6da..834afe66f5f 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-rstudioapi'
 pkgname=R-cran-rstudioapi
 version=0.11
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"

From 97926ef02c68aabc4820532275ab3eb2d3d6b5b0 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:06:24 +0200
Subject: [PATCH 47/57] R-cran-pkgbuild: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgbuild/template b/srcpkgs/R-cran-pkgbuild/template
index 333e2dc440e..539be556b82 100644
--- a/srcpkgs/R-cran-pkgbuild/template
+++ b/srcpkgs/R-cran-pkgbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgbuild'
 pkgname=R-cran-pkgbuild
 version=1.1.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-callr R-cran-cli R-cran-crayon R-cran-desc
  R-cran-prettyunits R-cran-R6 R-cran-rprojroot R-cran-withr"

From 42c9b59c4a32d255e9963f61101970d43eea5df7 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:07:08 +0200
Subject: [PATCH 48/57] R-cran-pkgload: revbump for R-4.0.2

---
 srcpkgs/R-cran-pkgload/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-pkgload/template b/srcpkgs/R-cran-pkgload/template
index 1c19bfcf74e..b4ee55f56b3 100644
--- a/srcpkgs/R-cran-pkgload/template
+++ b/srcpkgs/R-cran-pkgload/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-pkgload'
 pkgname=R-cran-pkgload
 version=1.1.0
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-desc R-cran-pkgbuild
  R-cran-rlang R-cran-rprojroot R-cran-rstudioapi R-cran-withr"

From ee2f379348e98acccf3cd97544fe1b63f8f7dafb Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:10:19 +0200
Subject: [PATCH 49/57] R-cran-scales: revbump for R-4.0.2

---
 srcpkgs/R-cran-scales/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template
index 59d94fe7c63..c4dec24cdbc 100644
--- a/srcpkgs/R-cran-scales/template
+++ b/srcpkgs/R-cran-scales/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-scales'
 pkgname=R-cran-scales
 version=1.1.1
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-RColorBrewer R-cran-farver
  R-cran-munsell R-cran-labeling R-cran-R6

From b41832c1a5c2e5f4899b8c6b61978a79cbd61543 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:11:29 +0200
Subject: [PATCH 50/57] R-cran-lubridate: revbump for R-4.0.2

---
 srcpkgs/R-cran-lubridate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lubridate/template b/srcpkgs/R-cran-lubridate/template
index 3a6e7e93250..76601e943c2 100644
--- a/srcpkgs/R-cran-lubridate/template
+++ b/srcpkgs/R-cran-lubridate/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lubridate'
 pkgname=R-cran-lubridate
 version=1.7.9
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-generics R-cran-Rcpp"
 depends="R-cran-generics R-cran-Rcpp>=0.12.13"

From d5c44bfca36ab0488e69540a478678cf18009c37 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:12:37 +0200
Subject: [PATCH 51/57] R-cran-lazyeval: revbump for R-4.0.2

---
 srcpkgs/R-cran-lazyeval/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-lazyeval/template b/srcpkgs/R-cran-lazyeval/template
index fad91bb02df..39c731f0d4c 100644
--- a/srcpkgs/R-cran-lazyeval/template
+++ b/srcpkgs/R-cran-lazyeval/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-lazyeval'
 pkgname=R-cran-lazyeval
 version=0.2.2
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Lazy (Non-Standard) Evaluation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 1bbe41df7e51dbd26e57905475f52aeebbd2cb97 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:12:58 +0200
Subject: [PATCH 52/57] R-cran-labeling: revbump for R-4.0.2

---
 srcpkgs/R-cran-labeling/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index ba02bb27473..4ec70142e3d 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-labeling'
 pkgname=R-cran-labeling
 version=0.3
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Axis Labeling"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 31b34314743ea91e9f1d4cb328e92915506a2493 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:13:41 +0200
Subject: [PATCH 53/57] R-cran-gtable: revbump for R-4.0.2

---
 srcpkgs/R-cran-gtable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-gtable/template b/srcpkgs/R-cran-gtable/template
index 17402cef790..08cf057baf8 100644
--- a/srcpkgs/R-cran-gtable/template
+++ b/srcpkgs/R-cran-gtable/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-gtable'
 pkgname=R-cran-gtable
 version=0.3.0
-revision=1
+revision=2
 build_style=R-cran
 short_desc="Arrange 'Grobs' in Tables"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 4c5e6bba6a4491186507d22f601f1adaf8bf7bbf Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:14:28 +0200
Subject: [PATCH 54/57] R-cran-testthat: revbump for R-4.0.2

---
 srcpkgs/R-cran-testthat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-testthat/template b/srcpkgs/R-cran-testthat/template
index 32380062d9f..8e3b946f389 100644
--- a/srcpkgs/R-cran-testthat/template
+++ b/srcpkgs/R-cran-testthat/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-testthat'
 pkgname=R-cran-testthat
 version=2.3.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-digest R-cran-ellipsis
  R-cran-evaluate R-cran-magrittr R-cran-pkgload R-cran-praise R-cran-R6

From 341f383491170ab57800009419e3a873833b007f Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:15:17 +0200
Subject: [PATCH 55/57] R-cran-isoband: revbump for R-4.0.2

---
 srcpkgs/R-cran-isoband/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index 58e2b9f16ef..651747354b4 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-isoband'
 pkgname=R-cran-isoband
 version=0.2.2
-revision=1
+revision=2
 build_style=R-cran
 hostmakedepends="R-cran-testthat"
 depends="R-cran-testthat"

From 579fc7c9293884eda339076f0593415ca94ff85b Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:16:31 +0200
Subject: [PATCH 56/57] R-cran-ggplot2: revbump for R-4.0.2

---
 srcpkgs/R-cran-ggplot2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ebcea042a99..8ee6e36ae78 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
 version=3.3.2
-revision=1
+revision=2
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
  R-cran-rlang R-cran-scales R-cran-tibble R-cran-withr"

From 0183d9e1fec7b5d8415308d6923ae418b3da31e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sun, 9 Aug 2020 14:23:57 +0200
Subject: [PATCH 57/57] emacs-ess: revbump for R-4.0.2

---
 srcpkgs/emacs-ess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs-ess/template b/srcpkgs/emacs-ess/template
index 88bb906cbc5..40338f2f137 100644
--- a/srcpkgs/emacs-ess/template
+++ b/srcpkgs/emacs-ess/template
@@ -2,7 +2,7 @@
 pkgname=emacs-ess
 reverts="18.10r1_1"
 version=18.10.2
-revision=2
+revision=3
 archs=noarch
 create_wrksrc=yes
 build_wrksrc="ess-${version}"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (7 preceding siblings ...)
  2020-08-14 21:19 ` [PR PATCH] [Updated] " luhann
@ 2020-08-14 21:19 ` luhann
  2020-08-15 14:47 ` jnbr
  2020-08-15 14:47 ` [PR PATCH] [Closed]: " jnbr
  10 siblings, 0 replies; 12+ messages in thread
From: luhann @ 2020-08-14 21:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by luhann on void-packages repository

https://github.com/void-linux/void-packages/pull/24126#issuecomment-674276669

Comment:
I've build and run tested all of the packages on x86_64 without issue. I can't test on other hardware but I haven't made any changes that should break things. So it should be ready to merge. 

I've also rebased the branch.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (8 preceding siblings ...)
  2020-08-14 21:19 ` luhann
@ 2020-08-15 14:47 ` jnbr
  2020-08-15 14:47 ` [PR PATCH] [Closed]: " jnbr
  10 siblings, 0 replies; 12+ messages in thread
From: jnbr @ 2020-08-15 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/24126#issuecomment-674407073

Comment:
merged in fe6c78837a9f6b6a182419466b3a6c9e4959ec08

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Closed]: R: update to 4.0.2.
  2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
                   ` (9 preceding siblings ...)
  2020-08-15 14:47 ` jnbr
@ 2020-08-15 14:47 ` jnbr
  10 siblings, 0 replies; 12+ messages in thread
From: jnbr @ 2020-08-15 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2502 bytes --]

There's a closed pull request on the void-packages repository

R: update to 4.0.2.
https://github.com/void-linux/void-packages/pull/24126

Description:
This is a major version update to R with some breaking changes for older R packages/scripts. Although the problems with most CRAN packages should be resolved as CRAN gave package authors a deadline to submit fixes. I've been using R 4.0 for a couple of months now and not experienced any problems.

## Breaking Changes

- Packages need to be (re-)installed under this version (4.0.2) of R.
- R now uses a stringsAsFactors = FALSE default, and hence by default no longer converts strings to factors in calls to data.frame() and read.table(). A large number of packages relied on the previous behaviour and so have needed/will need updating.

## Build Changes
- This version of R is built against the PCRE2 library for Perl-like regular expressions, if available.
- Enable memory profiling by building with --enable-memory-profiling flag, this is the default on all binaries provided by upstream, and several other distros.

## Dependencies to Build and Check

Some R-cran-* packages failed xlint, so I've changed those where appropriate.

- [x] R-cran-R6
- [x] R-cran-RColorBrewer
- [x] R-cran-Rcpp
- [x] R-cran-assertthat
- [x] R-cran-backports
- [x] R-cran-callr
- [x] R-cran-cli
- [x] R-cran-colorspace
- [x] R-cran-crayon
- [x] R-cran-data.table
- [x] R-cran-desc
- [x] R-cran-dichromat
- [x] R-cran-digest
- [x] R-cran-ellipsis
- [x] R-cran-evaluate
- [x] R-cran-fansi
- [x] R-cran-farver
- [x] R-cran-generics
- [x] R-cran-ggplot2
- [x] R-cran-glue
- [x] R-cran-gsubfn
- [x] R-cran-gtable
- [x] R-cran-isoband
- [x] R-cran-labeling
- [x] R-cran-lazyeval
- [x] R-cran-lifecycle
- [x] R-cran-lubridate
- [x] R-cran-magrittr
- [x] R-cran-munsell
- [x] R-cran-nloptr
- [x] R-cran-pillar
- [x] R-cran-pkgbuild
- [x] R-cran-pkgconfig
- [x] R-cran-pkgload
- [x] R-cran-plyr
- [x] R-cran-praise
- [x] R-cran-prettyunits
- [x] R-cran-processx
- [x] R-cran-proto
- [x] R-cran-ps
- [x] R-cran-reshape2
- [x] R-cran-rlang
- [x] R-cran-rprojroot
- [x] R-cran-rstudioapi
- [x] R-cran-scales
- [x] R-cran-stringi
- [x] R-cran-stringr
- [x] R-cran-testthat
- [x] R-cran-tibble
- [x] R-cran-utf8
- [x] R-cran-vctrs
- [x] R-cran-viridisLite
- [x] R-cran-withr
- [x] R-cran-zeallot
- [x] R-cran-zoo
- [x] emacs-ess
- [x] rstudio (this takes a while to build, will probably be a separate PR)


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2020-08-15 14:47 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-07 10:40 [PR PATCH] [WIP] R: update to 4.0.2 luhann
2020-08-07 12:24 ` [PR PATCH] [Updated] " luhann
2020-08-07 13:30 ` luhann
2020-08-07 16:15 ` luhann
2020-08-07 21:56 ` luhann
2020-08-09 12:34 ` luhann
2020-08-12 10:22 ` [PR PATCH] [Updated] " luhann
2020-08-14 20:14 ` jnbr
2020-08-14 21:19 ` [PR PATCH] [Updated] " luhann
2020-08-14 21:19 ` luhann
2020-08-15 14:47 ` jnbr
2020-08-15 14:47 ` [PR PATCH] [Closed]: " jnbr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).