diff --git a/BioArchLinux/r-common/PKGBUILD b/BioArchLinux/r-common/PKGBUILD index fbc99366a0..68e5d5b96e 100644 --- a/BioArchLinux/r-common/PKGBUILD +++ b/BioArchLinux/r-common/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Solutions for Common Problems in Base R" arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=(custom:CC0) +license=('CC0-1.0') depends=( r ) @@ -23,12 +23,9 @@ optdepends=( r-rstudioapi r-testthat ) -source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" - "$pkgname-CC0.txt::https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt") -md5sums=('92231535ce9cf7327dd33aff8449d463' - '65d3616852dbf7b1a6d4b53b00626032') -sha256sums=('183e5f937823ff6b8ef1b22679177c3e25ffbb256784879ece0cefdba78e9978' - 'a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499') +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('92231535ce9cf7327dd33aff8449d463') +sha256sums=('183e5f937823ff6b8ef1b22679177c3e25ffbb256784879ece0cefdba78e9978') build() { mkdir -p build @@ -43,6 +40,4 @@ check() { package() { install -d "$pkgdir/usr/lib/R/library" cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" - - install -Dm644 "$pkgname-CC0.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/BioArchLinux/r-common/lilac.yaml b/BioArchLinux/r-common/lilac.yaml index ddc06b4d5c..58ba2174d8 100644 --- a/BioArchLinux/r-common/lilac.yaml +++ b/BioArchLinux/r-common/lilac.yaml @@ -10,3 +10,5 @@ update_on: repo: cran md5: true - alias: r +- source: manual + manual: 1 diff --git a/BioArchLinux/r-logr/PKGBUILD b/BioArchLinux/r-logr/PKGBUILD index 50471b74bd..ad52b93472 100644 --- a/BioArchLinux/r-logr/PKGBUILD +++ b/BioArchLinux/r-logr/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Creates Log Files" arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=(custom:CC0) +license=('CC0-1.0') depends=( r-common r-withr @@ -27,12 +27,9 @@ optdepends=( r-testthat r-tidylog ) -source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" - "$pkgname-CC0.txt::https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt") -md5sums=('6b216952470eee98af6641ad8a816f97' - '65d3616852dbf7b1a6d4b53b00626032') -sha256sums=('9566dcb34d56ad742d3ac4832b5d8b93f4d374182ea877b1a022ab19ee15ea40' - 'a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499') +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('6b216952470eee98af6641ad8a816f97') +sha256sums=('9566dcb34d56ad742d3ac4832b5d8b93f4d374182ea877b1a022ab19ee15ea40') build() { mkdir -p build @@ -47,6 +44,4 @@ check() { package() { install -d "$pkgdir/usr/lib/R/library" cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" - - install -Dm644 "$pkgname-CC0.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/BioArchLinux/r-logr/lilac.yaml b/BioArchLinux/r-logr/lilac.yaml index 963e5d366e..ba1349b8a1 100644 --- a/BioArchLinux/r-logr/lilac.yaml +++ b/BioArchLinux/r-logr/lilac.yaml @@ -15,3 +15,5 @@ update_on: repo: cran md5: true - alias: r +- source: manual + manual: 1 diff --git a/BioArchLinux/r-nycflights13/PKGBUILD b/BioArchLinux/r-nycflights13/PKGBUILD index 9fdcd78fe6..e3b2e840fd 100644 --- a/BioArchLinux/r-nycflights13/PKGBUILD +++ b/BioArchLinux/r-nycflights13/PKGBUILD @@ -9,19 +9,16 @@ pkgrel=2 pkgdesc="Flights that Departed NYC in 2013" arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=(custom:CC0) +license=('CC0-1.0') depends=( r-tibble ) optdepends=( r-dplyr ) -source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" - "$pkgname-CC0.txt::https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt") -md5sums=('3d483829c9d11c675044cbe7cdf79f3a' - '65d3616852dbf7b1a6d4b53b00626032') -sha256sums=('0e87c5a4e285f16750e91c75aeba33b1e4682cdabf4a3effe5a1de7398394a1d' - 'a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499') +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('3d483829c9d11c675044cbe7cdf79f3a') +sha256sums=('0e87c5a4e285f16750e91c75aeba33b1e4682cdabf4a3effe5a1de7398394a1d') build() { mkdir -p build @@ -31,6 +28,4 @@ build() { package() { install -d "$pkgdir/usr/lib/R/library" cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" - - install -Dm644 "$pkgname-CC0.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/BioArchLinux/r-nycflights13/lilac.yaml b/BioArchLinux/r-nycflights13/lilac.yaml index 275ab43d04..975e0ee7db 100644 --- a/BioArchLinux/r-nycflights13/lilac.yaml +++ b/BioArchLinux/r-nycflights13/lilac.yaml @@ -10,3 +10,5 @@ update_on: repo: cran md5: true - alias: r +- source: manual + manual: 1 diff --git a/BioArchLinux/r-palmerpenguins/PKGBUILD b/BioArchLinux/r-palmerpenguins/PKGBUILD index c1a4984976..0f0a28d5bb 100644 --- a/BioArchLinux/r-palmerpenguins/PKGBUILD +++ b/BioArchLinux/r-palmerpenguins/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=6 pkgdesc="Palmer Archipelago (Antarctica) Penguin Data" arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=(custom:CC0) +license=('CC0-1.0') depends=( r ) @@ -22,12 +22,9 @@ optdepends=( r-tibble r-tidyr ) -source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" - "$pkgname-CC0.txt::https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt") -md5sums=('dff628ed0c5f7b8e265127221491934e' - '65d3616852dbf7b1a6d4b53b00626032') -sha256sums=('2a40d48ba6c7978fdf2a6daf647ccb39cd17590680138931d11194d3dd1a30b4' - 'a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499') +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('dff628ed0c5f7b8e265127221491934e') +sha256sums=('2a40d48ba6c7978fdf2a6daf647ccb39cd17590680138931d11194d3dd1a30b4') build() { mkdir -p build @@ -37,6 +34,4 @@ build() { package() { install -d "$pkgdir/usr/lib/R/library" cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" - - install -Dm644 "$pkgname-CC0.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/BioArchLinux/r-palmerpenguins/lilac.yaml b/BioArchLinux/r-palmerpenguins/lilac.yaml index 35987427bf..45bcfb4cb3 100644 --- a/BioArchLinux/r-palmerpenguins/lilac.yaml +++ b/BioArchLinux/r-palmerpenguins/lilac.yaml @@ -8,3 +8,5 @@ update_on: repo: cran md5: true - alias: r +- source: manual + manual: 1 diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index cff5dc2dc1..d19387185f 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -194,7 +194,7 @@ license_map = { "BSD_2_clause + file LICENSE": "BSD", "BSD_3_clause + file LICENSE": "BSD", "BSL-1.0": "Boost", - "CC0": "custom:CC0", + "CC0": "CC0-1.0", "EPL": "EPL", "GPL": "GPL", "GPL (>= 2)": "GPL",