From e5b9f55a9ee8a2aaaacd30290df21fd2d349b856 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 -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 " 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 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 " From 253085004a6510bfd207083ba2bce293d7a295ba Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 398e6003542ae45be5a4f8f5e0963b8b0120d016 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 08f9d0ca3ec2e26acbc54a9eacdae780cfd22b02 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From bd618f5ed70006509b8ad6704c5004dc980fac27 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " -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 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 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 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 " From 7ca6a7f876aee158af6e2e15fc67e2bda579d82c Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 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 " From 14f38e3c6beb414b94597d4ffec7685aa2eaeced Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 6a4324f93119619137a4faf669d3360e5d9bd3c7 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From dcbc641c53ca9b6c9cbd8b86875cfdbf30fbebc3 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 601141bc36d517c681c9b7e018086684c69124d1 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 19d86e56e13cf6d554184b3fb5ca7b2c8e15da07 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 91c266ad29978a793cd7cc9917f8e2618dd02d2e Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 06aa5b6925b5fdc0b2e1ee6c3a8a3e7a3de1d450 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 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 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 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 " -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 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 " From 21f48a0656e9e42290a3d7e1750c5e03fa1de3a7 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 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 " From 47b66a8377a6f049481a511152e2c13923e6f7d8 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " From 145a199f38792891ea76259566d0454c0cdb63e1 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 " -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 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 " license="GPL-2.0-or-later" From 66cd8fc3f6e8e0a7014e698419abc54d46c49979 Mon Sep 17 00:00:00 2001 From: Luke Hannan 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 "