From 14f3698664482182efcf5de9ff58e95d360e33e9 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Tue, 5 Mar 2024 01:26:16 +0200 Subject: [PATCH] r-genepop: fix package --- BioArchLinux/r-genepop/PKGBUILD | 31 +++++++++++++++++++------------ BioArchLinux/r-genepop/lilac.py | 5 ++++- BioArchLinux/r-genepop/lilac.yaml | 3 ++- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/BioArchLinux/r-genepop/PKGBUILD b/BioArchLinux/r-genepop/PKGBUILD index 22a32db88f..9f07492332 100644 --- a/BioArchLinux/r-genepop/PKGBUILD +++ b/BioArchLinux/r-genepop/PKGBUILD @@ -3,32 +3,39 @@ _pkgname=genepop _pkgver=1.2.2 pkgname=r-${_pkgname,,} -pkgver=${_pkgver//[:-]/.} +pkgver=${_pkgver//-/.} pkgrel=0 -pkgdesc='Population Genetic Data Analysis Using Genepop' -arch=('x86_64') -url="https://cran.r-project.org/package=${_pkgname}" +pkgdesc="Population Genetic Data Analysis Using Genepop" +arch=(x86_64) +url="https://cran.r-project.org/package=$_pkgname" license=('CECILL-2.0') depends=( - r r-rcpp - r-rcppprogress r-stringr ) +makedepends=( + r-rcppprogress +) optdepends=( r-knitr r-shiny r-testthat ) -source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('a') +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" + "$_pkgname-LICENSE::http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt") +md5sums=('5fc72670d5c6237dfb373ec79f569bea' + '599cf91b33571e942d3ba5f9623b8011') +b2sums=('4934ef20f980c277217c618667b19c5e73c47e3dec8b7201281c3c0eeb057a365fbc55b16115d338b69419568f64e8c34e6c58cc6950760ecf0e4d90c86e81d9' + 'ff97dacc39b8597e670dbaf5bc0f0e4db73eada273708433fc227fa72c054a30a67dbc7b2416089d68f09ab65da721e5b30711022c41047d9cf706731d568038') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir build + R CMD INSTALL -l build "$_pkgname" } package() { - install -dm0755 "${pkgdir}/usr/lib/R/library" - cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library" + install -d "$pkgdir/usr/lib/R/library" + cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" + + install -Dm644 "$_pkgname-LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -# vim:set ts=2 sw=2 et: diff --git a/BioArchLinux/r-genepop/lilac.py b/BioArchLinux/r-genepop/lilac.py index b5cdb057c5..9de86aa0f5 100644 --- a/BioArchLinux/r-genepop/lilac.py +++ b/BioArchLinux/r-genepop/lilac.py @@ -7,7 +7,10 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build(_G) + r_pre_build( + _G, + expect_license = "CeCILL-2", + ) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-genepop/lilac.yaml b/BioArchLinux/r-genepop/lilac.yaml index ebfcd42535..b692d28c95 100644 --- a/BioArchLinux/r-genepop/lilac.yaml +++ b/BioArchLinux/r-genepop/lilac.yaml @@ -4,8 +4,9 @@ maintainers: email: kuoi@bioarchlinux.org repo_depends: - r-rcpp -- r-rcppprogress - r-stringr +repo_makedepends: +- r-rcppprogress update_on: - source: rpkgs pkgname: genepop