diff --git a/BioArchLinux/r-aer/PKGBUILD b/BioArchLinux/r-aer/PKGBUILD index 802084c007..fd942e3024 100644 --- a/BioArchLinux/r-aer/PKGBUILD +++ b/BioArchLinux/r-aer/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=3 pkgdesc="Applied Econometrics with R" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-car r-formula diff --git a/BioArchLinux/r-alphahull/PKGBUILD b/BioArchLinux/r-alphahull/PKGBUILD index 03dd36e49d..ef00d940ca 100644 --- a/BioArchLinux/r-alphahull/PKGBUILD +++ b/BioArchLinux/r-alphahull/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Generalization of the Convex Hull of a Sample of Points in the Plane" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-ggplot2 r-interp diff --git a/BioArchLinux/r-backports/PKGBUILD b/BioArchLinux/r-backports/PKGBUILD index 996262b9f2..5b55136294 100644 --- a/BioArchLinux/r-backports/PKGBUILD +++ b/BioArchLinux/r-backports/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=10 pkgdesc="Reimplementations of Functions Introduced Since R-3.0.0" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/BioArchLinux/r-bamlss/PKGBUILD b/BioArchLinux/r-bamlss/PKGBUILD index 0e9b9fda20..44b2d8be2b 100644 --- a/BioArchLinux/r-bamlss/PKGBUILD +++ b/BioArchLinux/r-bamlss/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Bayesian Additive Models for Location, Scale, and Shape (and Beyond)" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( blas lapack diff --git a/BioArchLinux/r-base64enc/PKGBUILD b/BioArchLinux/r-base64enc/PKGBUILD index e0d7fba0df..ecdea1dbc6 100644 --- a/BioArchLinux/r-base64enc/PKGBUILD +++ b/BioArchLinux/r-base64enc/PKGBUILD @@ -12,7 +12,7 @@ pkgrel=11 pkgdesc="Tools for base64 encoding" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/BioArchLinux/r-biocparallel/PKGBUILD b/BioArchLinux/r-biocparallel/PKGBUILD index 16d3f236aa..562adab04e 100644 --- a/BioArchLinux/r-biocparallel/PKGBUILD +++ b/BioArchLinux/r-biocparallel/PKGBUILD @@ -12,7 +12,7 @@ pkgrel=2 pkgdesc="Bioconductor facilities for parallel evaluation" arch=(x86_64) url="https://bioconductor.org/packages/$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-futile.logger r-snow diff --git a/BioArchLinux/r-bit/PKGBUILD b/BioArchLinux/r-bit/PKGBUILD index 827f1a49d9..b2b0cb2500 100644 --- a/BioArchLinux/r-bit/PKGBUILD +++ b/BioArchLinux/r-bit/PKGBUILD @@ -12,7 +12,7 @@ pkgrel=3 pkgdesc="Classes and Methods for Fast Memory-Efficient Boolean Selections" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/BioArchLinux/r-cairo/PKGBUILD b/BioArchLinux/r-cairo/PKGBUILD index deac50a777..4511b6fe8c 100644 --- a/BioArchLinux/r-cairo/PKGBUILD +++ b/BioArchLinux/r-cairo/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=2 pkgdesc="R Graphics Device using Cairo Graphics Library for Creating High-Quality Bitmap (PNG, JPEG, TIFF), Vector (PDF, SVG, PostScript) and Display (X11 and Win32) Output" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( cairo freetype2 diff --git a/BioArchLinux/r-crch/PKGBUILD b/BioArchLinux/r-crch/PKGBUILD index 5fb67de13f..a69633bb1c 100644 --- a/BioArchLinux/r-crch/PKGBUILD +++ b/BioArchLinux/r-crch/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Censored Regression with Conditional Heteroscedasticity" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-formula r-ordinal diff --git a/BioArchLinux/r-fansi/PKGBUILD b/BioArchLinux/r-fansi/PKGBUILD index 16f892d2be..826774ceb1 100644 --- a/BioArchLinux/r-fansi/PKGBUILD +++ b/BioArchLinux/r-fansi/PKGBUILD @@ -13,7 +13,7 @@ pkgrel=1 pkgdesc="ANSI Control Sequence Aware String Functions" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/BioArchLinux/r-fastica/PKGBUILD b/BioArchLinux/r-fastica/PKGBUILD index e19e74a497..750fc4069e 100644 --- a/BioArchLinux/r-fastica/PKGBUILD +++ b/BioArchLinux/r-fastica/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="FastICA Algorithms to Perform ICA and Projection Pursuit" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( blas lapack diff --git a/BioArchLinux/r-formula/PKGBUILD b/BioArchLinux/r-formula/PKGBUILD index 8c0fb75451..fdecb39387 100644 --- a/BioArchLinux/r-formula/PKGBUILD +++ b/BioArchLinux/r-formula/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=3 pkgdesc="Extended Model Formulas" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/BioArchLinux/r-glmx/PKGBUILD b/BioArchLinux/r-glmx/PKGBUILD index 042e24993e..1496bccd4e 100644 --- a/BioArchLinux/r-glmx/PKGBUILD +++ b/BioArchLinux/r-glmx/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Generalized Linear Models Extended" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-formula r-lmtest diff --git a/BioArchLinux/r-memisc/PKGBUILD b/BioArchLinux/r-memisc/PKGBUILD index 2a8600975c..cb7b60fa79 100644 --- a/BioArchLinux/r-memisc/PKGBUILD +++ b/BioArchLinux/r-memisc/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Management of Survey Data and Presentation of Analysis Results" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-data.table r-jsonlite diff --git a/BioArchLinux/r-nonnest2/PKGBUILD b/BioArchLinux/r-nonnest2/PKGBUILD index 87d3464679..fd621217fe 100644 --- a/BioArchLinux/r-nonnest2/PKGBUILD +++ b/BioArchLinux/r-nonnest2/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=3 pkgdesc="Tests of Non-Nested Models" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-compquadform r-lavaan diff --git a/BioArchLinux/r-png/PKGBUILD b/BioArchLinux/r-png/PKGBUILD index 55bdf95aef..3f71cb9056 100644 --- a/BioArchLinux/r-png/PKGBUILD +++ b/BioArchLinux/r-png/PKGBUILD @@ -12,7 +12,7 @@ pkgrel=4 pkgdesc="Read and write PNG images" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( libpng r diff --git a/BioArchLinux/r-rodbc/PKGBUILD b/BioArchLinux/r-rodbc/PKGBUILD index 7bdaf92dac..5e44d53e17 100644 --- a/BioArchLinux/r-rodbc/PKGBUILD +++ b/BioArchLinux/r-rodbc/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="ODBC Database Access" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r unixodbc diff --git a/BioArchLinux/r-rstpm2/PKGBUILD b/BioArchLinux/r-rstpm2/PKGBUILD index 0d408dd753..bbcd91f54b 100644 --- a/BioArchLinux/r-rstpm2/PKGBUILD +++ b/BioArchLinux/r-rstpm2/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Smooth Survival Models, Including Generalized Survival Models" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( blas lapack diff --git a/BioArchLinux/r-rvisdiff/PKGBUILD b/BioArchLinux/r-rvisdiff/PKGBUILD index 05eceb6bfe..573fc04841 100644 --- a/BioArchLinux/r-rvisdiff/PKGBUILD +++ b/BioArchLinux/r-rvisdiff/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Interactive Graphs for Differential Expression" arch=(any) url="https://bioconductor.org/packages/$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-edger ) diff --git a/BioArchLinux/r-statmod/PKGBUILD b/BioArchLinux/r-statmod/PKGBUILD index 5350869318..c74c29502b 100644 --- a/BioArchLinux/r-statmod/PKGBUILD +++ b/BioArchLinux/r-statmod/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=3 pkgdesc="Statistical Modeling" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/BioArchLinux/r-tiff/PKGBUILD b/BioArchLinux/r-tiff/PKGBUILD index d9e1bf22d8..2aeb126f0c 100644 --- a/BioArchLinux/r-tiff/PKGBUILD +++ b/BioArchLinux/r-tiff/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Read and Write TIFF Images" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( libtiff r diff --git a/BioArchLinux/r-unitizer/PKGBUILD b/BioArchLinux/r-unitizer/PKGBUILD index ab3afb09a1..1df923c020 100644 --- a/BioArchLinux/r-unitizer/PKGBUILD +++ b/BioArchLinux/r-unitizer/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Interactive R Unit Tests" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r-crayon r-diffobj diff --git a/BioArchLinux/r-zoo/PKGBUILD b/BioArchLinux/r-zoo/PKGBUILD index 8a0b09ddbd..776486f395 100644 --- a/BioArchLinux/r-zoo/PKGBUILD +++ b/BioArchLinux/r-zoo/PKGBUILD @@ -13,7 +13,7 @@ pkgrel=3 pkgdesc="S3 Infrastructure for Regular and Irregular Time Series (Z's Ordered Observations)" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-only OR GPL-3.0-only') depends=( r ) diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 8c952878c9..e79081611b 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -206,7 +206,7 @@ license_map = { "GPL (>= 3.0)": "GPL3", "GPL (>=2)": "GPL-2.0-or-later", "GPL-2": "GPL2", - "GPL-2 | GPL-3": "GPL", + "GPL-2 | GPL-3": "GPL-2.0-only OR GPL-3.0-only", "GPL-3": "GPL3", "LGPL": "LGPL-2.0-or-later", "LGPL (>= 2)": "LGPL",