[arch-commits] Commit in python-json5/repos/community-any (PKGBUILD PKGBUILD)

2022-05-08 Thread Antonio Rojas via arch-commits
Date: Monday, May 9, 2022 @ 06:58:16
  Author: arojas
Revision: 1196325

archrelease: copy trunk to community-any

Added:
  python-json5/repos/community-any/PKGBUILD
(from rev 1196324, python-json5/trunk/PKGBUILD)
Deleted:
  python-json5/repos/community-any/PKGBUILD

--+
 PKGBUILD |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-09 06:58:03 UTC (rev 1196324)
+++ PKGBUILD2022-05-09 06:58:16 UTC (rev 1196325)
@@ -1,23 +0,0 @@
-# Maintainer: Antonio Rojas 
-
-pkgname=python-json5
-pkgver=0.9.7
-pkgrel=1
-pkgdesc='A Python implementation of the JSON5 data format'
-arch=(any)
-url='https://pypi.org/project/json5/'
-license=(MPL GPL LGPL)
-depends=(python)
-makedepends=(python-build python-installer python-setuptools python-wheel)
-source=(https://github.com/dpranke/pyjson5/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('22f95577eed978a4c7833173e17b9d79e08443ac16b604fd1301e07e10fdf779')
-
-build() {
-  cd pyjson5-$pkgver
-  python -m build --wheel --no-isolation
-}
-
-package() {
-  cd pyjson5-$pkgver
-  python -m installer --destdir="$pkgdir" dist/*.whl
-}

Copied: python-json5/repos/community-any/PKGBUILD (from rev 1196324, 
python-json5/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-09 06:58:16 UTC (rev 1196325)
@@ -0,0 +1,23 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=python-json5
+pkgver=0.9.8
+pkgrel=1
+pkgdesc='A Python implementation of the JSON5 data format'
+arch=(any)
+url='https://pypi.org/project/json5/'
+license=(MPL GPL LGPL)
+depends=(python)
+makedepends=(python-build python-installer python-setuptools python-wheel)
+source=(https://github.com/dpranke/pyjson5/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('2818dd37e39d61e6bb9f36d62be51ac33fc2c365b91ae0c4bf186f529e8af418')
+
+build() {
+  cd pyjson5-$pkgver
+  python -m build --wheel --no-isolation
+}
+
+package() {
+  cd pyjson5-$pkgver
+  python -m installer --destdir="$pkgdir" dist/*.whl
+}



[arch-commits] Commit in python-json5/trunk (PKGBUILD)

2022-05-08 Thread Antonio Rojas via arch-commits
Date: Monday, May 9, 2022 @ 06:58:03
  Author: arojas
Revision: 1196324

Update to 0.9.8

Modified:
  python-json5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-09 06:54:24 UTC (rev 1196323)
+++ PKGBUILD2022-05-09 06:58:03 UTC (rev 1196324)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas 
 
 pkgname=python-json5
-pkgver=0.9.7
+pkgver=0.9.8
 pkgrel=1
 pkgdesc='A Python implementation of the JSON5 data format'
 arch=(any)
@@ -10,7 +10,7 @@
 depends=(python)
 makedepends=(python-build python-installer python-setuptools python-wheel)
 
source=(https://github.com/dpranke/pyjson5/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('22f95577eed978a4c7833173e17b9d79e08443ac16b604fd1301e07e10fdf779')
+sha256sums=('2818dd37e39d61e6bb9f36d62be51ac33fc2c365b91ae0c4bf186f529e8af418')
 
 build() {
   cd pyjson5-$pkgver



[arch-commits] Commit in python-jupyter_client/repos/community-any (PKGBUILD PKGBUILD)

2022-05-08 Thread Antonio Rojas via arch-commits
Date: Monday, May 9, 2022 @ 06:54:24
  Author: arojas
Revision: 1196323

archrelease: copy trunk to community-any

Added:
  python-jupyter_client/repos/community-any/PKGBUILD
(from rev 1196322, python-jupyter_client/trunk/PKGBUILD)
Deleted:
  python-jupyter_client/repos/community-any/PKGBUILD

--+
 PKGBUILD |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-09 06:54:14 UTC (rev 1196322)
+++ PKGBUILD2022-05-09 06:54:24 UTC (rev 1196323)
@@ -1,34 +0,0 @@
-# Maintainer: Kyle Keen 
-
-pkgname=python-jupyter_client
-pkgver=7.3.0
-pkgrel=1
-pkgdesc="Jupyter protocol implementation and client libraries"
-arch=('any')
-url="https://pypi.python.org/pypi/jupyter_client";
-license=('BSD')
-depends=('python-ipykernel' 'python-traitlets' 'python-pyzmq'
- 'python-jupyter_core' 'python-dateutil' 'python-entrypoints' 
'python-nest-asyncio')
-makedepends=('python-build' 'python-installer' 'python-wheel')
-checkdepends=('python-pytest' 'python-async_generator' 'python-pytest-asyncio' 
'python-pytest-timeout')
-#source=("$pkgname-$pkgver.tgz::https://github.com/jupyter/jupyter_client/archive/$pkgver.tar.gz";)
-source=("https://files.pythonhosted.org/packages/source/j/jupyter_client/jupyter_client-$pkgver.tar.gz";)
-sha256sums=('3bcc8e08a294d0fa9406e48cfe17e11ef0efdb7c504fe8cc335128e3ef8f3dac')
-
-# dep cycle with python-ipykernel
-
-build() {
-  cd jupyter_client-$pkgver
-  python -m build --wheel --no-isolation
-}
-
-check() {
-  cd jupyter_client-$pkgver
-  pytest -vv
-}
-
-package() {
-  cd jupyter_client-$pkgver
-  python -m installer --destdir="$pkgdir" dist/*.whl
-  install -Dm644 COPYING.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: python-jupyter_client/repos/community-any/PKGBUILD (from rev 1196322, 
python-jupyter_client/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-09 06:54:24 UTC (rev 1196323)
@@ -0,0 +1,34 @@
+# Maintainer: Kyle Keen 
+
+pkgname=python-jupyter_client
+pkgver=7.3.1
+pkgrel=1
+pkgdesc="Jupyter protocol implementation and client libraries"
+arch=('any')
+url="https://pypi.python.org/pypi/jupyter_client";
+license=('BSD')
+depends=('python-ipykernel' 'python-traitlets' 'python-pyzmq'
+ 'python-jupyter_core' 'python-dateutil' 'python-entrypoints' 
'python-nest-asyncio')
+makedepends=('python-build' 'python-installer' 'python-wheel')
+checkdepends=('python-pytest' 'python-async_generator' 'python-pytest-asyncio' 
'python-pytest-timeout')
+#source=("$pkgname-$pkgver.tgz::https://github.com/jupyter/jupyter_client/archive/$pkgver.tar.gz";)
+source=("https://files.pythonhosted.org/packages/source/j/jupyter_client/jupyter_client-$pkgver.tar.gz";)
+sha256sums=('05d4ff6a0ade25138c6bb0fbeac7ddc26b5fe835e7dd816b64b4a45b931bdc0b')
+
+# dep cycle with python-ipykernel
+
+build() {
+  cd jupyter_client-$pkgver
+  python -m build --wheel --no-isolation
+}
+
+check() {
+  cd jupyter_client-$pkgver
+  pytest -vv
+}
+
+package() {
+  cd jupyter_client-$pkgver
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  install -Dm644 COPYING.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}



[arch-commits] Commit in python-jupyter_client/trunk (PKGBUILD)

2022-05-08 Thread Antonio Rojas via arch-commits
Date: Monday, May 9, 2022 @ 06:54:14
  Author: arojas
Revision: 1196322

Update to 7.3.1

Modified:
  python-jupyter_client/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-09 06:23:49 UTC (rev 1196321)
+++ PKGBUILD2022-05-09 06:54:14 UTC (rev 1196322)
@@ -1,7 +1,7 @@
 # Maintainer: Kyle Keen 
 
 pkgname=python-jupyter_client
-pkgver=7.3.0
+pkgver=7.3.1
 pkgrel=1
 pkgdesc="Jupyter protocol implementation and client libraries"
 arch=('any')
@@ -13,7 +13,7 @@
 checkdepends=('python-pytest' 'python-async_generator' 'python-pytest-asyncio' 
'python-pytest-timeout')
 
#source=("$pkgname-$pkgver.tgz::https://github.com/jupyter/jupyter_client/archive/$pkgver.tar.gz";)
 
source=("https://files.pythonhosted.org/packages/source/j/jupyter_client/jupyter_client-$pkgver.tar.gz";)
-sha256sums=('3bcc8e08a294d0fa9406e48cfe17e11ef0efdb7c504fe8cc335128e3ef8f3dac')
+sha256sums=('05d4ff6a0ade25138c6bb0fbeac7ddc26b5fe835e7dd816b64b4a45b931bdc0b')
 
 # dep cycle with python-ipykernel
 



[arch-commits] Commit in rust-analyzer/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Daniel M. Capella via arch-commits
Date: Monday, May 9, 2022 @ 06:23:49
  Author: polyzen
Revision: 1196321

archrelease: copy trunk to community-x86_64

Added:
  rust-analyzer/repos/community-x86_64/PKGBUILD
(from rev 1196320, rust-analyzer/trunk/PKGBUILD)
Deleted:
  rust-analyzer/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   66 ++---
 1 file changed, 33 insertions(+), 33 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-09 06:23:15 UTC (rev 1196320)
+++ PKGBUILD2022-05-09 06:23:49 UTC (rev 1196321)
@@ -1,33 +0,0 @@
-# Maintainer: Daniel M. Capella 
-# Contributor: Sergey A. 
-
-pkgname=rust-analyzer
-_pkgver=2022-05-02
-pkgver=${_pkgver//-}
-pkgrel=1
-pkgdesc='Rust compiler front-end for IDEs'
-arch=('x86_64')
-url=https://rust-analyzer.github.io/
-license=('Apache' 'MIT')
-depends=('gcc-libs' 'rust-src')
-makedepends=('git')
-source=("git+https://github.com/rust-lang/$pkgname.git#tag=$_pkgver";)
-b2sums=('SKIP')
-
-prepare() {
-  cd $pkgname
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-}
-
-build() {
-  cd $pkgname
-  RUST_ANALYZER_REV=$_pkgver cargo build --release --locked --offline
-}
-
-package() {
-  cd $pkgname
-  install -Dt "$pkgdir"/usr/bin target/release/$pkgname
-  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE-MIT
-}
-
-# vim:set ts=2 sw=2 et:

Copied: rust-analyzer/repos/community-x86_64/PKGBUILD (from rev 1196320, 
rust-analyzer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-09 06:23:49 UTC (rev 1196321)
@@ -0,0 +1,33 @@
+# Maintainer: Daniel M. Capella 
+# Contributor: Sergey A. 
+
+pkgname=rust-analyzer
+_pkgver=2022-05-09
+pkgver=${_pkgver//-}
+pkgrel=1
+pkgdesc='Rust compiler front-end for IDEs'
+arch=('x86_64')
+url=https://rust-analyzer.github.io/
+license=('Apache' 'MIT')
+depends=('gcc-libs' 'rust-src')
+makedepends=('git')
+source=("git+https://github.com/rust-lang/$pkgname.git#tag=$_pkgver";)
+b2sums=('SKIP')
+
+prepare() {
+  cd $pkgname
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+build() {
+  cd $pkgname
+  RUST_ANALYZER_REV=$_pkgver cargo build --release --locked --offline
+}
+
+package() {
+  cd $pkgname
+  install -Dt "$pkgdir"/usr/bin target/release/$pkgname
+  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE-MIT
+}
+
+# vim:set ts=2 sw=2 et:



[arch-commits] Commit in rust-analyzer/trunk (PKGBUILD)

2022-05-08 Thread Daniel M. Capella via arch-commits
Date: Monday, May 9, 2022 @ 06:23:15
  Author: polyzen
Revision: 1196320

upgpkg: rust-analyzer 20220509-1

Modified:
  rust-analyzer/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-09 01:00:34 UTC (rev 1196319)
+++ PKGBUILD2022-05-09 06:23:15 UTC (rev 1196320)
@@ -2,7 +2,7 @@
 # Contributor: Sergey A. 
 
 pkgname=rust-analyzer
-_pkgver=2022-05-02
+_pkgver=2022-05-09
 pkgver=${_pkgver//-}
 pkgrel=1
 pkgdesc='Rust compiler front-end for IDEs'



[arch-commits] Commit in chezmoi/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Daurnimator via arch-commits
Date: Monday, May 9, 2022 @ 01:00:34
  Author: daurnimator
Revision: 1196319

archrelease: copy trunk to community-x86_64

Added:
  chezmoi/repos/community-x86_64/PKGBUILD
(from rev 1196318, chezmoi/trunk/PKGBUILD)
Deleted:
  chezmoi/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |  124 ++---
 1 file changed, 62 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-09 01:00:18 UTC (rev 1196318)
+++ PKGBUILD2022-05-09 01:00:34 UTC (rev 1196319)
@@ -1,62 +0,0 @@
-# Maintainer: Daurnimator 
-# Maintainer: Caleb Maclennan 
-# Contributor: Tom Payne 
-# Contributor:  
-
-pkgname=chezmoi
-pkgver=2.15.2
-pkgrel=1
-pkgdesc="Manage your dotfiles across multiple machines"
-arch=('x86_64')
-url='https://www.chezmoi.io/'
-license=('MIT')
-makedepends=('go' 'git')
-depends=('glibc')
-checkdepends=('zip')
-options=('!lto')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/twpayne/chezmoi/archive/v${pkgver}.tar.gz";)
-sha512sums=('b3753c585caffcc8c1d3cebac4b4282ea08a8d0835d95c85209ca79173c41eaa0841024f22416eaaccbd90683f01da116a3b733a142bb9c55e496d16f4b901cb')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  go mod download
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export GOPROXY=off
-  go build \
--trimpath \
--buildmode=pie \
--mod=readonly \
--tags noupgrade \
--ldflags "-X 
github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/$pkgname \
-  -X main.version=$pkgver \
-  -X main.date=$(date -u +'%Y-%m-%dT%H:%M:%SZ' 
--date=@${SOURCE_DATE_EPOCH}) \
-  -extldflags ${LDFLAGS}" \
-.
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-
-  go test -v ./...
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
-
-  install -Dm644 completions/chezmoi-completion.bash 
"$pkgdir/usr/share/bash-completion/completions/chezmoi"
-  install -Dm644 completions/chezmoi.fish 
"$pkgdir/usr/share/fish/vendor_completions.d/chezmoi.fish"
-  install -Dm644 completions/chezmoi.zsh 
"$pkgdir/usr/share/zsh/site-functions/_chezmoi"
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: chezmoi/repos/community-x86_64/PKGBUILD (from rev 1196318, 
chezmoi/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-09 01:00:34 UTC (rev 1196319)
@@ -0,0 +1,62 @@
+# Maintainer: Daurnimator 
+# Maintainer: Caleb Maclennan 
+# Contributor: Tom Payne 
+# Contributor:  
+
+pkgname=chezmoi
+pkgver=2.15.3
+pkgrel=1
+pkgdesc="Manage your dotfiles across multiple machines"
+arch=('x86_64')
+url='https://www.chezmoi.io/'
+license=('MIT')
+makedepends=('go' 'git')
+depends=('glibc')
+checkdepends=('zip')
+options=('!lto')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/twpayne/chezmoi/archive/v${pkgver}.tar.gz";)
+sha512sums=('6e491788bb4de81b5786204969ff56764c2190820ec9376bfbb26bf2507fc43d49c691bce06ea2725c6d8c1f4cbf6c6c101604d6d2f3b360ad0f03c7e5f1e967')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  go mod download
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export GOPROXY=off
+  go build \
+-trimpath \
+-buildmode=pie \
+-mod=readonly \
+-tags noupgrade \
+-ldflags "-X 
github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/$pkgname \
+  -X main.version=$pkgver \
+  -X main.date=$(date -u +'%Y-%m-%dT%H:%M:%SZ' 
--date=@${SOURCE_DATE_EPOCH}) \
+  -extldflags ${LDFLAGS}" \
+.
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+
+  go test -v ./...
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
+
+  install -Dm644 completions/chezmoi-completion.bash 
"$pkgdir/usr/share/bash-completion/completions/chezmoi"
+  install -Dm644 completions/chezmoi.fish 
"$pkgdir/usr/share/fish/vendor_completions.d/chezmoi.fish"
+  install -Dm644 completions/chezmoi.zsh 
"$pkgdir/usr/share/zsh/site-functions/_chezmoi"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}



[arch-commits] Commit in chezmoi/trunk (PKGBUILD)

2022-05-08 Thread Daurnimator via arch-commits
Date: Monday, May 9, 2022 @ 01:00:18
  Author: daurnimator
Revision: 1196318

upgpkg: chezmoi 2.15.3-1

Modified:
  chezmoi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 23:38:11 UTC (rev 1196317)
+++ PKGBUILD2022-05-09 01:00:18 UTC (rev 1196318)
@@ -4,7 +4,7 @@
 # Contributor:  
 
 pkgname=chezmoi
-pkgver=2.15.2
+pkgver=2.15.3
 pkgrel=1
 pkgdesc="Manage your dotfiles across multiple machines"
 arch=('x86_64')
@@ -15,7 +15,7 @@
 checkdepends=('zip')
 options=('!lto')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/twpayne/chezmoi/archive/v${pkgver}.tar.gz";)
-sha512sums=('b3753c585caffcc8c1d3cebac4b4282ea08a8d0835d95c85209ca79173c41eaa0841024f22416eaaccbd90683f01da116a3b733a142bb9c55e496d16f4b901cb')
+sha512sums=('6e491788bb4de81b5786204969ff56764c2190820ec9376bfbb26bf2507fc43d49c691bce06ea2725c6d8c1f4cbf6c6c101604d6d2f3b360ad0f03c7e5f1e967')
 
 prepare() {
   cd "$pkgname-$pkgver"



[arch-commits] Commit in bash-language-server/repos/community-x86_64 (2 files)

2022-05-08 Thread Daniel M. Capella via arch-commits
Date: Sunday, May 8, 2022 @ 23:38:11
  Author: polyzen
Revision: 1196317

archrelease: copy trunk to community-x86_64

Added:
  bash-language-server/repos/community-x86_64/PKGBUILD
(from rev 1196316, bash-language-server/trunk/PKGBUILD)
Deleted:
  bash-language-server/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   71 ++---
 1 file changed, 36 insertions(+), 35 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 23:37:47 UTC (rev 1196316)
+++ PKGBUILD2022-05-08 23:38:11 UTC (rev 1196317)
@@ -1,35 +0,0 @@
-# Maintainer: Felix Yan 
-# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
-
-pkgname=bash-language-server
-pkgver=2.0.0
-pkgrel=5
-pkgdesc="Bash language server implementation based on Tree Sitter and its 
grammar for Bash"
-arch=("x86_64")
-url="https://github.com/bash-lsp/$pkgname";
-license=("MIT")
-depends=("nodejs" "acorn")
-makedepends=("yarn" "typescript" "git")
-optdepends=('bash-completion: for CLI args completion')
-source=("$url/archive/server-$pkgver.tar.gz")
-sha512sums=('e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9')
-
-build() {
-cd "$pkgname-server-$pkgver"
-yarn
-yarn run compile
-}
-
-package() {
-install -d "$pkgdir/usr/lib/$pkgname"
-cd "$pkgdir/usr/lib/$pkgname"
-cp -a "$srcdir/$pkgname-server-$pkgver/server/"* .
-install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" 
"$srcdir/$pkgname-server-$pkgver/LICENSE"
-
-rm -r node_modules/acorn
-mkdir -p node_modules/acorn/bin
-ln -s /usr/bin/acorn node_modules/acorn/bin/acorn
-
-install -d "$pkgdir/usr/bin"
-ln -s "/usr/lib/$pkgname/bin/main.js" "$pkgdir/usr/bin/$pkgname"
-}

Copied: bash-language-server/repos/community-x86_64/PKGBUILD (from rev 1196316, 
bash-language-server/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 23:38:11 UTC (rev 1196317)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan 
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Maintainer: Daniel M. Capella 
+
+pkgname=bash-language-server
+pkgver=2.1.0
+pkgrel=1
+pkgdesc="Bash language server implementation based on Tree Sitter and its 
grammar for Bash"
+arch=("x86_64")
+url="https://github.com/bash-lsp/$pkgname";
+license=("MIT")
+depends=("nodejs<18.1.0" "acorn")
+makedepends=("yarn" "typescript" "git")
+optdepends=('bash-completion: for CLI args completion')
+source=("$url/archive/server-$pkgver.tar.gz")
+sha512sums=('4a1814636345595b6561a8bb4a0a7cf48e52a9a86e6ea16120b3ef55d37502561be9fcaa4bc03e6eedbdaaee08d97398f17d02c6c4683c8810ef0aeb36e0dc15')
+
+build() {
+cd "$pkgname-server-$pkgver"
+yarn
+yarn run compile
+}
+
+package() {
+install -d "$pkgdir/usr/lib/$pkgname"
+cd "$pkgdir/usr/lib/$pkgname"
+cp -a "$srcdir/$pkgname-server-$pkgver/server/"* .
+install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" 
"$srcdir/$pkgname-server-$pkgver/LICENSE"
+
+rm -r node_modules/acorn
+mkdir -p node_modules/acorn/bin
+ln -s /usr/bin/acorn node_modules/acorn/bin/acorn
+
+install -d "$pkgdir/usr/bin"
+ln -s "/usr/lib/$pkgname/bin/main.js" "$pkgdir/usr/bin/$pkgname"
+}



[arch-commits] Commit in bash-language-server/trunk (PKGBUILD)

2022-05-08 Thread Daniel M. Capella via arch-commits
Date: Sunday, May 8, 2022 @ 23:37:47
  Author: polyzen
Revision: 1196316

upgpkg: bash-language-server 2.1.0-1 & depend on nodejs<18.1.0

- Pin older Node.js due to 
https://github.com/bash-lsp/bash-language-server/issues/353

- Built with nodejs-lts-gallium

Modified:
  bash-language-server/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 21:03:10 UTC (rev 1196315)
+++ PKGBUILD2022-05-08 23:37:47 UTC (rev 1196316)
@@ -1,18 +1,19 @@
 # Maintainer: Felix Yan 
 # Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Maintainer: Daniel M. Capella 
 
 pkgname=bash-language-server
-pkgver=2.0.0
-pkgrel=5
+pkgver=2.1.0
+pkgrel=1
 pkgdesc="Bash language server implementation based on Tree Sitter and its 
grammar for Bash"
 arch=("x86_64")
 url="https://github.com/bash-lsp/$pkgname";
 license=("MIT")
-depends=("nodejs" "acorn")
+depends=("nodejs<18.1.0" "acorn")
 makedepends=("yarn" "typescript" "git")
 optdepends=('bash-completion: for CLI args completion')
 source=("$url/archive/server-$pkgver.tar.gz")
-sha512sums=('e72df6f13ed4b861b81329059d41cdfada2729e9523e619ef26d6ed0a2a5400a3dda659b4f4af923a2a9fb2054b99b9d6db082508f2ba06ac0f9a421516e2ce9')
+sha512sums=('4a1814636345595b6561a8bb4a0a7cf48e52a9a86e6ea16120b3ef55d37502561be9fcaa4bc03e6eedbdaaee08d97398f17d02c6c4683c8810ef0aeb36e0dc15')
 
 build() {
 cd "$pkgname-server-$pkgver"



[arch-commits] Commit in maturin/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 21:03:10
  Author: dvzrv
Revision: 1196315

archrelease: copy trunk to community-x86_64

Added:
  maturin/repos/community-x86_64/PKGBUILD
(from rev 1196314, maturin/trunk/PKGBUILD)
Deleted:
  maturin/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 21:03:03 UTC (rev 1196314)
+++ PKGBUILD2022-05-08 21:03:10 UTC (rev 1196315)
@@ -1,34 +0,0 @@
-# Maintainer: David Runge 
-
-pkgname=maturin
-pkgver=0.12.14
-pkgrel=1
-pkgdesc="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-url="https://github.com/PyO3/maturin";
-arch=(x86_64)
-license=(Apache)
-depends=(gcc-libs glibc rust)
-makedepends=(bzip2 dbus git)
-# disable LTO until ring can be built with it: 
https://github.com/briansmith/ring/issues/1444
-options=(!lto)
-source=($pkgname-$pkgver.tar.gz::https://github.com/PyO3/$pkgname/archive/refs/tags/v$pkgver.tar.gz)
-sha512sums=('ba05b24165724329804c97bb5cf87f49ff6d748e8da6126867781c6053f939524416932674e9daa69015e29d908233a6110a7094b2c79443bde321309d850ac2')
-b2sums=('27a2056aa3ecea5586851d5739db57d8f20c053fc4dc517e99b2143df916b2355fef719c456972305a18c6d4067675a49388de9d777ddb9be16923296fecf0f7')
-
-prepare() {
-  cd $pkgname-$pkgver
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-}
-
-build() {
-  cd $pkgname-$pkgver
-  cargo build --frozen --release --all-features
-}
-
-package() {
-  depends+=(libbz2.so libdbus-1.so)
-
-  cd $pkgname-$pkgver
-  install -vDm 755 target/release/maturin -t "$pkgdir/usr/bin/"
-  install -vDm 644 {Changelog,Readme}.md -t "$pkgdir/usr/share/doc/$pkgname/"
-}

Copied: maturin/repos/community-x86_64/PKGBUILD (from rev 1196314, 
maturin/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 21:03:10 UTC (rev 1196315)
@@ -0,0 +1,34 @@
+# Maintainer: David Runge 
+
+pkgname=maturin
+pkgver=0.12.15
+pkgrel=1
+pkgdesc="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+url="https://github.com/PyO3/maturin";
+arch=(x86_64)
+license=(Apache)
+depends=(gcc-libs glibc rust)
+makedepends=(bzip2 dbus git)
+# disable LTO until ring can be built with it: 
https://github.com/briansmith/ring/issues/1444
+options=(!lto)
+source=($pkgname-$pkgver.tar.gz::https://github.com/PyO3/$pkgname/archive/refs/tags/v$pkgver.tar.gz)
+sha512sums=('0ae2f8ac7b32c4560b7c5ebb9305c2587a5bd10fb9a2d0a32a35a6df315ff8c5511bf2a5b5e76e2c4eeba73868e87e718b304854ce8964207af832c72a5014d0')
+b2sums=('dde49d096561afac552567bd54b06b9ece49a7d4c57e461d94869d1b57028f959287e18ec816101b9d972fb1ba5d2124fa5dea5e7d178e7c0a538a8f7d4176ff')
+
+prepare() {
+  cd $pkgname-$pkgver
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+build() {
+  cd $pkgname-$pkgver
+  cargo build --frozen --release --all-features
+}
+
+package() {
+  depends+=(libbz2.so libdbus-1.so)
+
+  cd $pkgname-$pkgver
+  install -vDm 755 target/release/maturin -t "$pkgdir/usr/bin/"
+  install -vDm 644 {Changelog,Readme}.md -t "$pkgdir/usr/share/doc/$pkgname/"
+}



[arch-commits] Commit in maturin/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 21:03:03
  Author: dvzrv
Revision: 1196314

upgpkg: maturin 0.12.15-1: Upgrade to 0.12.15.

Modified:
  maturin/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:44:40 UTC (rev 1196313)
+++ PKGBUILD2022-05-08 21:03:03 UTC (rev 1196314)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 
 pkgname=maturin
-pkgver=0.12.14
+pkgver=0.12.15
 pkgrel=1
 pkgdesc="Build and publish crates with pyo3, rust-cpython and cffi bindings"
 url="https://github.com/PyO3/maturin";
@@ -12,8 +12,8 @@
 # disable LTO until ring can be built with it: 
https://github.com/briansmith/ring/issues/1444
 options=(!lto)
 
source=($pkgname-$pkgver.tar.gz::https://github.com/PyO3/$pkgname/archive/refs/tags/v$pkgver.tar.gz)
-sha512sums=('ba05b24165724329804c97bb5cf87f49ff6d748e8da6126867781c6053f939524416932674e9daa69015e29d908233a6110a7094b2c79443bde321309d850ac2')
-b2sums=('27a2056aa3ecea5586851d5739db57d8f20c053fc4dc517e99b2143df916b2355fef719c456972305a18c6d4067675a49388de9d777ddb9be16923296fecf0f7')
+sha512sums=('0ae2f8ac7b32c4560b7c5ebb9305c2587a5bd10fb9a2d0a32a35a6df315ff8c5511bf2a5b5e76e2c4eeba73868e87e718b304854ce8964207af832c72a5014d0')
+b2sums=('dde49d096561afac552567bd54b06b9ece49a7d4c57e461d94869d1b57028f959287e18ec816101b9d972fb1ba5d2124fa5dea5e7d178e7c0a538a8f7d4176ff')
 
 prepare() {
   cd $pkgname-$pkgver



[arch-commits] Commit in nextcloud-app-notes/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:44:40
  Author: dvzrv
Revision: 1196313

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-notes/repos/community-staging-any/
  nextcloud-app-notes/repos/community-staging-any/PKGBUILD
(from rev 1196312, nextcloud-app-notes/trunk/PKGBUILD)

--+
 PKGBUILD |   91 +
 1 file changed, 91 insertions(+)

Copied: nextcloud-app-notes/repos/community-staging-any/PKGBUILD (from rev 
1196312, nextcloud-app-notes/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 20:44:40 UTC (rev 1196313)
@@ -0,0 +1,91 @@
+# Maintainer: Sergej Pupykin 
+# Maintainer: David Runge 
+# Contributor: David Runge 
+
+pkgname=nextcloud-app-notes
+_name=notes
+pkgver=4.3.1
+pkgrel=2
+pkgdesc="Simple Notes app for Nextcloud"
+arch=('any')
+url="https://github.com/nextcloud/notes";
+license=('AGPL3')
+makedepends=('nextcloud' 'ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nextcloud/notes/releases/download/v${pkgver}/notes.tar.gz";)
+sha512sums=('2b21580f2a2a79fac8e46cc6c6ddb564f05469866c816c27f32b2b14f3a1c2dd64cb646735e24c2daec1401fb465dab943b20955e4b388924245a881c1e8dd89')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+  _get_php_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
+  cp -R "${srcdir}/notes" "${pkgdir}/usr/share/webapps/nextcloud/apps/notes"
+}



[arch-commits] Commit in nextcloud-app-notes/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:44:30
  Author: dvzrv
Revision: 1196312

upgpkg: nextcloud-app-notes 4.3.1-2: Rebuild to add more specific dependency on 
php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-notes/trunk/PKGBUILD

--+
 PKGBUILD |   53 ++---
 1 file changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:40:23 UTC (rev 1196311)
+++ PKGBUILD2022-05-08 20:44:30 UTC (rev 1196312)
@@ -5,13 +5,12 @@
 pkgname=nextcloud-app-notes
 _name=notes
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple Notes app for Nextcloud"
 arch=('any')
 url="https://github.com/nextcloud/notes";
 license=('AGPL3')
-depends=('nextcloud')
-makedepends=('ripgrep' 'yq')
+makedepends=('nextcloud' 'ripgrep' 'yq')
 groups=('nextcloud-apps')
 options=('!strip')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nextcloud/notes/releases/download/v${pkgver}/notes.tar.gz";)
@@ -23,10 +22,31 @@
   _app_max_major_version=$(expr ${_app_max_major_version} + 1)
 }
 
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
 check() {
   local _app_min_major_version
   local _app_max_major_version
   _get_nextcloud_versions
+  _get_php_versions
 
   local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
@@ -33,11 +53,38 @@
 printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
 exit 1
   fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
 }
 
 package() {
   _get_nextcloud_versions
+  _get_php_versions
+
   depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
 
   install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
   cp -R "${srcdir}/notes" "${pkgdir}/usr/share/webapps/nextcloud/apps/notes"



[arch-commits] Commit in nextcloud-app-tasks/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:40:23
  Author: dvzrv
Revision: 1196311

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-tasks/repos/community-staging-any/
  nextcloud-app-tasks/repos/community-staging-any/PKGBUILD
(from rev 1196310, nextcloud-app-tasks/trunk/PKGBUILD)

--+
 PKGBUILD |   91 +
 1 file changed, 91 insertions(+)

Copied: nextcloud-app-tasks/repos/community-staging-any/PKGBUILD (from rev 
1196310, nextcloud-app-tasks/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 20:40:23 UTC (rev 1196311)
@@ -0,0 +1,91 @@
+# Maintainer: Sergej Pupykin 
+# Maintainer: Jonas Heinrich 
+# Contributor: Jonas Heinrich 
+
+pkgname=nextcloud-app-tasks
+_name=tasks
+pkgver=0.14.4
+pkgrel=2
+pkgdesc="Enhanced task app for NextCloud"
+arch=('any')
+url="https://github.com/nextcloud/tasks";
+license=('AGPL')
+makedepends=('nextcloud' 'ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("tasks-${pkgver}.tar.gz::https://github.com/nextcloud/tasks/releases/download/v$pkgver/tasks.tar.gz";)
+sha512sums=('6515014829c58bc15f5e72ad63a99ac4054b9af74877dd01f35f55d726918a20b24985605faed72a968cc2d7704f591c4737b865be53a9c917a255b7090ca793')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+  _get_php_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
+  cp -a "${srcdir}/tasks" "${pkgdir}/usr/share/webapps/nextcloud/apps/tasks"
+}



[arch-commits] Commit in nextcloud-app-tasks/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:40:17
  Author: dvzrv
Revision: 1196310

upgpkg: nextcloud-app-tasks 0.14.4-2: Rebuild to add more specific dependency 
on php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-tasks/trunk/PKGBUILD

--+
 PKGBUILD |   53 ++---
 1 file changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:37:16 UTC (rev 1196309)
+++ PKGBUILD2022-05-08 20:40:17 UTC (rev 1196310)
@@ -5,13 +5,12 @@
 pkgname=nextcloud-app-tasks
 _name=tasks
 pkgver=0.14.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Enhanced task app for NextCloud"
 arch=('any')
 url="https://github.com/nextcloud/tasks";
 license=('AGPL')
-depends=('nextcloud')
-makedepends=('ripgrep' 'yq')
+makedepends=('nextcloud' 'ripgrep' 'yq')
 groups=('nextcloud-apps')
 options=('!strip')
 
source=("tasks-${pkgver}.tar.gz::https://github.com/nextcloud/tasks/releases/download/v$pkgver/tasks.tar.gz";)
@@ -23,10 +22,31 @@
   _app_max_major_version=$(expr ${_app_max_major_version} + 1)
 }
 
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
 check() {
   local _app_min_major_version
   local _app_max_major_version
   _get_nextcloud_versions
+  _get_php_versions
 
   local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
@@ -33,11 +53,38 @@
 printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
 exit 1
   fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
 }
 
 package() {
   _get_nextcloud_versions
+  _get_php_versions
+
   depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
 
   install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
   cp -a "${srcdir}/tasks" "${pkgdir}/usr/share/webapps/nextcloud/apps/tasks"



[arch-commits] Commit in nextcloud-app-spreed/repos/community-staging-any (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:37:16
  Author: dvzrv
Revision: 1196309

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-spreed/repos/community-staging-any/PKGBUILD
(from rev 1196308, nextcloud-app-spreed/trunk/PKGBUILD)
Deleted:
  nextcloud-app-spreed/repos/community-staging-any/PKGBUILD

--+
 PKGBUILD |  196 ++---
 1 file changed, 99 insertions(+), 97 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 20:37:08 UTC (rev 1196308)
+++ PKGBUILD2022-05-08 20:37:16 UTC (rev 1196309)
@@ -1,97 +0,0 @@
-# Maintainer: David Runge 
-
-_name=spreed
-pkgname=nextcloud-app-spreed
-pkgver=14.0.1
-pkgrel=1
-epoch=1
-pkgdesc="Video & audio-conferencing using WebRTC"
-arch=(any)
-url="https://apps.nextcloud.com/apps/spreed";
-license=(AGPL3)
-groups=(nextcloud-apps)
-makedepends=(nextcloud)
-checkdepends=(ripgrep yq)
-source=(https://github.com/nextcloud-releases/$_name/releases/download/v$pkgver/$_name-v$pkgver.tar.gz)
-sha512sums=('b3467aa5d77900ab8d1a2c302128d06668889212b9598bc455a3ef69fcf5702d4f999df3ac107febe9d6e7b80fd23b3cbec3545e9490238882b329c6a06e3e04')
-b2sums=('bb1e05dd2593ec8f78e7c8fcd8aa3ad1e7fe5bf2aeb4f0336744d90969151e61f3cd946a019ff871773d2d678b6e2e260eb7a69736c77e812c8018d1d17a48eb')
-
-_get_nextcloud_versions() {
-  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
-}
-
-_get_php_versions() {
-  local _phps=(php7 php)
-
-  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  if [[ $_app_max_php != 'null' ]]; then
-_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
-  fi
-  _system_php=""
-  for _php in "${_phps[@]}"; do
-if command -v "$_php" > /dev/null; then
-  if [[ -z "$_system_php" ]]; then
-_system_php="$_php"
-  fi
-fi
-  done
-}
-
-prepare() {
-  find ${_name} -type f -exec chmod 644 {} +
-  find ${_name} -type d -exec chmod 755 {} +
-}
-
-check() {
-  local _app_min_major_version
-  local _app_max_major_version
-  _get_nextcloud_versions
-  _get_php_versions
-  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
-
-  if (("$(vercmp "$_nextcloud_major_version" "$_app_min_major_version")"<0)) 
|| (("$(vercmp "$_nextcloud_major_version" "$_app_max_major_version")">0)) ; 
then
-printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "$_app_min_major_version" "$_app_max_major_version" 
"$_nextcloud_major_version"
-exit 1
-  fi
-
-  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
-  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-exit 1
-  fi
-  if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
-  exit 1
-fi
-  fi
-}
-
-package() {
-  _get_nextcloud_versions
-  _get_php_versions
-
-  depends=(
-"nextcloud>=$_app_min_major_version"
-"nextcloud<$_app_max_major_version"
-  )
-  if [[ "$_app_min_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter>=$_app_min_php"
-)
-  fi
-  if [[ "$_app_max_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter<$_app_max_php"
-)
-  fi
-  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php-interpreter)
-  fi
-
-  install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"
-  cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/"
-}

Copied: nextcloud-app-spreed/repos/community-staging-any/PKGBUILD (from rev 
1196308, nextcloud-app-spreed/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 20:37:16 UTC (rev 1196309)
@@ -0,0 +1,99 @@
+# Maintainer: David Runge 
+
+_name=spreed
+pkgname=nextcloud-app-spreed
+pkgver=14.0.1
+pkgrel=2
+epoch=1
+pkgdesc="Video & audio-conferencing using WebRTC"
+arch=(any)
+url="https://apps.nextcloud.com/apps/spreed";
+license=(AGPL3)
+groups=(nextcloud-apps)
+makedepends=(nextcloud)
+checkdepends=(ripgrep yq)
+source=(https://github.com/nextcloud-releases/$_name/releases/download/v$pkgver/$_name-v$pkgver.tar.gz)
+sha512sums=('b3467aa5d77900ab8d1a2c302128d0666

[arch-commits] Commit in nextcloud-app-spreed/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:37:08
  Author: dvzrv
Revision: 1196308

upgpkg: nextcloud-app-spreed 1:14.0.1-2: Rebuild to fix issues in version 
detection for php-interpreter.

Modified:
  nextcloud-app-spreed/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:33:22 UTC (rev 1196307)
+++ PKGBUILD2022-05-08 20:37:08 UTC (rev 1196308)
@@ -3,7 +3,7 @@
 _name=spreed
 pkgname=nextcloud-app-spreed
 pkgver=14.0.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Video & audio-conferencing using WebRTC"
 arch=(any)
@@ -27,9 +27,11 @@
 
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
   _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
   if [[ $_app_max_php != 'null' ]]; then
 _app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
   fi
+
   _system_php=""
   for _php in "${_phps[@]}"; do
 if command -v "$_php" > /dev/null; then
@@ -63,8 +65,8 @@
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
   exit 1
 fi
   fi



[arch-commits] Commit in nextcloud-app-news/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:33:22
  Author: dvzrv
Revision: 1196307

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-news/repos/community-staging-any/
  nextcloud-app-news/repos/community-staging-any/PKGBUILD
(from rev 1196306, nextcloud-app-news/trunk/PKGBUILD)

--+
 PKGBUILD |   92 +
 1 file changed, 92 insertions(+)

Copied: nextcloud-app-news/repos/community-staging-any/PKGBUILD (from rev 
1196306, nextcloud-app-news/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 20:33:22 UTC (rev 1196307)
@@ -0,0 +1,92 @@
+# Maintainer: David Runge 
+# Contributor: Jonas Heinrich 
+
+pkgname=nextcloud-app-news
+_name=news
+pkgver=18.0.1
+pkgrel=2
+pkgdesc="An RSS/Atom feed aggregator"
+arch=(any)
+url="https://github.com/nextcloud/news";
+license=(AGPL3)
+makedepends=(nextcloud ripgrep yq)
+source=($pkgname-$pkgver.tar.gz::https://github.com/nextcloud/$_name/releases/download/$pkgver/$_name.tar.gz)
+sha512sums=('18ebcc06e5b46dbea4295b5b0ba78cd1e71c77fb3492eca5ffaacf7d760ca98fbb8514f687400df58dd883ccd9f7b20e229935ce9e62c4343be8df01375b6cd1')
+b2sums=('3c178c99788dda43cb02bc56c57e86df106e96a7b51f63049dbde8d30d14a51d00ed8327e29a2922803532b12bc1b69bf95a816e4c7a2a08cf72f21b5ed16c5e')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+  _get_php_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$(php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=(
+"nextcloud>=${_app_min_major_version}"
+"nextcloud<${_app_max_major_version}"
+  )
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps"
+  cp -av "${_name}" "${pkgdir}/usr/share/webapps/nextcloud/apps/"
+}



[arch-commits] Commit in nextcloud-app-news/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:32:50
  Author: dvzrv
Revision: 1196306

upgpkg: nextcloud-app-news 18.0.1-2: Rebuild to add more specific dependency on 
php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-news/trunk/PKGBUILD

--+
 PKGBUILD |   34 --
 1 file changed, 28 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:29:05 UTC (rev 1196305)
+++ PKGBUILD2022-05-08 20:32:50 UTC (rev 1196306)
@@ -4,7 +4,7 @@
 pkgname=nextcloud-app-news
 _name=news
 pkgver=18.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An RSS/Atom feed aggregator"
 arch=(any)
 url="https://github.com/nextcloud/news";
@@ -21,8 +21,23 @@
 }
 
 _get_php_versions() {
+  local _phps=(php7 php)
+
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
   _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
 }
 
 check() {
@@ -39,12 +54,12 @@
 
   local _php_version="$(php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
   if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php <= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
   exit 1
 fi
   fi
@@ -57,13 +72,20 @@
   depends=(
 "nextcloud>=${_app_min_major_version}"
 "nextcloud<${_app_max_major_version}"
-"php>=$_app_min_php"
   )
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
   if [[ "$_app_max_php" != 'null' ]]; then
 depends+=(
-  "php<=$_app_max_php"
+  "php-interpreter<$_app_max_php"
 )
   fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
 
   install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps"
   cp -av "${_name}" "${pkgdir}/usr/share/webapps/nextcloud/apps/"



[arch-commits] Commit in nextcloud-app-mail/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:29:05
  Author: dvzrv
Revision: 1196305

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-mail/repos/community-staging-any/
  nextcloud-app-mail/repos/community-staging-any/PKGBUILD
(from rev 1196304, nextcloud-app-mail/trunk/PKGBUILD)

--+
 PKGBUILD |   91 +
 1 file changed, 91 insertions(+)

Copied: nextcloud-app-mail/repos/community-staging-any/PKGBUILD (from rev 
1196304, nextcloud-app-mail/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 20:29:05 UTC (rev 1196305)
@@ -0,0 +1,91 @@
+# Maintainer: Sergej Pupykin 
+# Maintainer: Jonas Heinrich 
+# Contributor: Jonas Heinrich 
+
+pkgname=nextcloud-app-mail
+_name=mail
+pkgver=1.11.0
+pkgrel=3
+pkgdesc="An email app for NextCloud"
+arch=('any')
+url="https://github.com/nextcloud/mail";
+license=('AGPL')
+makedepends=('nextcloud' 'php7' 'ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/mail/releases/download/v${pkgver}/mail.tar.gz";)
+sha512sums=('098f308339163b052c3ddf6eb6ff3cc7162358df1cf84789ac8175c697aa0d601d9e2e2a68a9337ca505636a2e8bce406bb937b1cbfbd691e3975493ec66b905')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+  _get_php_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
+  cp -a "${srcdir}/mail" "${pkgdir}/usr/share/webapps/nextcloud/apps/mail"
+}



[arch-commits] Commit in nextcloud-app-mail/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:28:59
  Author: dvzrv
Revision: 1196304

upgpkg: nextcloud-app-mail 1.11.0-3: Rebuild to add more specific dependency on 
php-interpreter.

Implement a versioned dependency on php-interpreter.
Add php7 to makedepends as the upstream project currently does not support php 
> 8.1.

Modified:
  nextcloud-app-mail/trunk/PKGBUILD

--+
 PKGBUILD |   53 ++---
 1 file changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:21:01 UTC (rev 1196303)
+++ PKGBUILD2022-05-08 20:28:59 UTC (rev 1196304)
@@ -5,13 +5,12 @@
 pkgname=nextcloud-app-mail
 _name=mail
 pkgver=1.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An email app for NextCloud"
 arch=('any')
 url="https://github.com/nextcloud/mail";
 license=('AGPL')
-depends=('nextcloud')
-makedepends=('ripgrep' 'yq')
+makedepends=('nextcloud' 'php7' 'ripgrep' 'yq')
 groups=('nextcloud-apps')
 options=('!strip')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/mail/releases/download/v${pkgver}/mail.tar.gz";)
@@ -23,10 +22,31 @@
   _app_max_major_version=$(expr ${_app_max_major_version} + 1)
 }
 
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
 check() {
   local _app_min_major_version
   local _app_max_major_version
   _get_nextcloud_versions
+  _get_php_versions
 
   local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
@@ -33,11 +53,38 @@
 printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
 exit 1
   fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
+  exit 1
+fi
+  fi
 }
 
 package() {
   _get_nextcloud_versions
+  _get_php_versions
+
   depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
 
   install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
   cp -a "${srcdir}/mail" "${pkgdir}/usr/share/webapps/nextcloud/apps/mail"



[arch-commits] Commit in nextcloud-app-contacts/repos/community-staging-any (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:21:01
  Author: dvzrv
Revision: 1196303

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-contacts/repos/community-staging-any/PKGBUILD
(from rev 1196302, nextcloud-app-contacts/trunk/PKGBUILD)
Deleted:
  nextcloud-app-contacts/repos/community-staging-any/PKGBUILD

--+
 PKGBUILD |  178 ++---
 1 file changed, 90 insertions(+), 88 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 20:20:53 UTC (rev 1196302)
+++ PKGBUILD2022-05-08 20:21:01 UTC (rev 1196303)
@@ -1,88 +0,0 @@
-# Maintainer: Sergej Pupykin 
-
-pkgname=nextcloud-app-contacts
-pkgver=4.1.0
-_name=contacts
-pkgrel=2
-pkgdesc="Contacts app for nextcloud"
-arch=('any')
-url="https://github.com/nextcloud/contacts/";
-license=('GPL')
-depends=('nextcloud')
-makedepends=('ripgrep' 'yq')
-groups=('nextcloud-apps')
-options=('!strip')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/contacts/releases/download/v$pkgver/contacts-v$pkgver.tar.gz";)
-sha256sums=('8c69a60e9b7b8e8c81a4be06d1e2f95180e7556e9074b7add07ee48618ea6d20')
-
-_get_nextcloud_versions() {
-  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
-}
-
-_get_php_versions() {
-  local _phps=(php7 php)
-
-  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  if [[ $_app_max_php != 'null' ]]; then
-_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
-  fi
-  _system_php=""
-  for _php in "${_phps[@]}"; do
-if command -v "$_php" > /dev/null; then
-  if [[ -z "$_system_php" ]]; then
-_system_php="$_php"
-  fi
-fi
-  done
-}
-
-check() {
-  local _app_min_major_version
-  local _app_max_major_version
-  _get_nextcloud_versions
-  _get_php_versions
-
-  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
-  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
-printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
-exit 1
-  fi
-
-  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
-  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-exit 1
-  fi
-  if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
-  exit 1
-fi
-  fi
-}
-
-package() {
-  _get_nextcloud_versions
-  _get_php_versions
-
-  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
-  if [[ "$_app_min_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter>=$_app_min_php"
-)
-  fi
-  if [[ "$_app_max_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter<$_app_max_php"
-)
-  fi
-  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php-interpreter)
-  fi
-
-  install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
-  cp -a "$srcdir"/${_name} "$pkgdir"/usr/share/webapps/nextcloud/apps/contacts
-}

Copied: nextcloud-app-contacts/repos/community-staging-any/PKGBUILD (from rev 
1196302, nextcloud-app-contacts/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 20:21:01 UTC (rev 1196303)
@@ -0,0 +1,90 @@
+# Maintainer: Sergej Pupykin 
+
+pkgname=nextcloud-app-contacts
+pkgver=4.1.0
+_name=contacts
+pkgrel=3
+pkgdesc="Contacts app for nextcloud"
+arch=('any')
+url="https://github.com/nextcloud/contacts/";
+license=('GPL')
+depends=('nextcloud')
+makedepends=('ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/contacts/releases/download/v$pkgver/contacts-v$pkgver.tar.gz";)
+sha256sums=('8c69a60e9b7b8e8c81a4be06d1e2f95180e7556e9074b7add07ee48618ea6d20')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+ 

[arch-commits] Commit in nextcloud-app-contacts/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:20:53
  Author: dvzrv
Revision: 1196302

upgpkg: nextcloud-app-contacts 4.1.0-3: Rebuild to fix issues in version 
detection for php-interpreter.

Modified:
  nextcloud-app-contacts/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:18:53 UTC (rev 1196301)
+++ PKGBUILD2022-05-08 20:20:53 UTC (rev 1196302)
@@ -3,7 +3,7 @@
 pkgname=nextcloud-app-contacts
 pkgver=4.1.0
 _name=contacts
-pkgrel=2
+pkgrel=3
 pkgdesc="Contacts app for nextcloud"
 arch=('any')
 url="https://github.com/nextcloud/contacts/";
@@ -26,9 +26,11 @@
 
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
   _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
   if [[ $_app_max_php != 'null' ]]; then
 _app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
   fi
+
   _system_php=""
   for _php in "${_phps[@]}"; do
 if command -v "$_php" > /dev/null; then
@@ -57,8 +59,8 @@
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
   exit 1
 fi
   fi



[arch-commits] Commit in nextcloud-app-bookmarks/repos/community-staging-any (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:18:53
  Author: dvzrv
Revision: 1196301

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-bookmarks/repos/community-staging-any/PKGBUILD
(from rev 1196300, nextcloud-app-bookmarks/trunk/PKGBUILD)
Deleted:
  nextcloud-app-bookmarks/repos/community-staging-any/PKGBUILD

--+
 PKGBUILD |  183 ++---
 1 file changed, 92 insertions(+), 91 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 20:18:44 UTC (rev 1196300)
+++ PKGBUILD2022-05-08 20:18:53 UTC (rev 1196301)
@@ -1,91 +0,0 @@
-# Maintainer: Sergej Pupykin 
-
-pkgname=nextcloud-app-bookmarks
-_name=bookmarks
-epoch=1
-pkgver=10.3.1
-pkgrel=3
-pkgdesc="Bookmarks app for nextcloud"
-arch=(any)
-url="https://github.com/nextcloud/bookmarks";
-license=(AGPL3)
-depends=(nextcloud)
-makedepends=(ripgrep yq)
-groups=(nextcloud-apps)
-options=(!strip)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/bookmarks/releases/download/v$pkgver/bookmarks-$pkgver.tar.gz";)
-sha256sums=('96f19ed9e1f7175745b527e1673e53bea0ccc84f212fb0e10330953dffa075c4')
-b2sums=('d1de66aa827594710e2659396db75ef98cbdf15a5cd16d627960eef9930e9613a8bde2fd8338e3df53184f45cb3ab17418b5273e4490ebf324763a623609ab39')
-
-_get_nextcloud_versions() {
-  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
-}
-
-_get_php_versions() {
-  local _phps=(php7 php)
-
-  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-
-  if [[ $_app_max_php != 'null' ]]; then
-_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
-  fi
-
-  _system_php=""
-  for _php in "${_phps[@]}"; do
-if command -v "$_php" > /dev/null; then
-  if [[ -z "$_system_php" ]]; then
-_system_php="$_php"
-  fi
-fi
-  done
-}
-
-check() {
-  local _app_min_major_version
-  local _app_max_major_version
-  _get_nextcloud_versions
-
-  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
-  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
-printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
-exit 1
-  fi
-
-  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
-  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-exit 1
-  fi
-  if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
-  exit 1
-fi
-  fi
-}
-
-package() {
-  _get_nextcloud_versions
-  _get_php_versions
-
-  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
-  if [[ "$_app_min_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter>=$_app_min_php"
-)
-  fi
-  if [[ "$_app_max_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter<$_app_max_php"
-)
-  fi
-  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php-interpreter)
-  fi
-
-  install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
-  cp -a "$srcdir"/bookmarks 
"$pkgdir"/usr/share/webapps/nextcloud/apps/bookmarks
-}

Copied: nextcloud-app-bookmarks/repos/community-staging-any/PKGBUILD (from rev 
1196300, nextcloud-app-bookmarks/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 20:18:53 UTC (rev 1196301)
@@ -0,0 +1,92 @@
+# Maintainer: Sergej Pupykin 
+
+pkgname=nextcloud-app-bookmarks
+_name=bookmarks
+epoch=1
+pkgver=10.3.1
+pkgrel=4
+pkgdesc="Bookmarks app for nextcloud"
+arch=(any)
+url="https://github.com/nextcloud/bookmarks";
+license=(AGPL3)
+depends=(nextcloud)
+makedepends=(ripgrep yq)
+groups=(nextcloud-apps)
+options=(!strip)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/bookmarks/releases/download/v$pkgver/bookmarks-$pkgver.tar.gz";)
+sha256sums=('96f19ed9e1f7175745b527e1673e53bea0ccc84f212fb0e10330953dffa075c4')
+b2sums=('d1de66aa827594710e2659396db75

[arch-commits] Commit in nextcloud-app-bookmarks/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:18:44
  Author: dvzrv
Revision: 1196300

upgpkg: nextcloud-app-bookmarks 1:10.3.1-4: Rebuild to fix issues in version 
detection for php-interpreter.

Modified:
  nextcloud-app-bookmarks/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:18:03 UTC (rev 1196299)
+++ PKGBUILD2022-05-08 20:18:44 UTC (rev 1196300)
@@ -4,7 +4,7 @@
 _name=bookmarks
 epoch=1
 pkgver=10.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Bookmarks app for nextcloud"
 arch=(any)
 url="https://github.com/nextcloud/bookmarks";
@@ -47,6 +47,7 @@
   local _app_min_major_version
   local _app_max_major_version
   _get_nextcloud_versions
+  _get_php_versions
 
   local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
@@ -60,8 +61,8 @@
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
   exit 1
 fi
   fi



[arch-commits] Commit in nextcloud-app-calendar/repos/community-staging-any (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:18:03
  Author: dvzrv
Revision: 1196299

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-calendar/repos/community-staging-any/PKGBUILD
(from rev 1196298, nextcloud-app-calendar/trunk/PKGBUILD)
Deleted:
  nextcloud-app-calendar/repos/community-staging-any/PKGBUILD

--+
 PKGBUILD |  177 +++--
 1 file changed, 91 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 20:17:55 UTC (rev 1196298)
+++ PKGBUILD2022-05-08 20:18:03 UTC (rev 1196299)
@@ -1,86 +0,0 @@
-# Maintainer: Sergej Pupykin 
-
-pkgname=nextcloud-app-calendar
-_name=calendar
-epoch=1
-pkgver=3.3.0
-pkgrel=2
-pkgdesc="Calendar app for nextcloud"
-arch=('any')
-url="https://github.com/nextcloud/calendar/";
-license=('AGPL')
-depends=('nextcloud')
-makedepends=('ripgrep' 'yq')
-groups=('nextcloud-apps')
-options=('!strip')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/calendar/releases/download/v$pkgver/calendar-v$pkgver.tar.gz";)
-sha256sums=('9f227c554bdfb731db486a51d763f7b65dd0451dc58a888460c949ec36713c98')
-
-_get_nextcloud_versions() {
-  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
-}
-
-_get_php_versions() {
-  local _phps=(php7 php)
-
-  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g' | awk -F '.' '{print $1"."$2+1}')"
-  _system_php=""
-  for _php in "${_phps[@]}"; do
-if command -v "$_php" > /dev/null; then
-  if [[ -z "$_system_php" ]]; then
-_system_php="$_php"
-  fi
-fi
-  done
-}
-
-check() {
-  local _app_min_major_version
-  local _app_max_major_version
-  _get_nextcloud_versions
-  _get_php_versions
-
-  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
-  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
-printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
-exit 1
-  fi
-
-  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
-  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-exit 1
-  fi
-  if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-  exit 1
-fi
-  fi
-}
-
-package() {
-  _get_nextcloud_versions
-  _get_php_versions
-
-  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
-  if [[ "$_app_min_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter>=$_app_min_php"
-)
-  fi
-  if [[ "$_app_max_php" != 'null' ]]; then
-depends+=(
-  "php-interpreter<$_app_max_php"
-)
-  fi
-  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php-interpreter)
-  fi
-
-  install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
-  cp -a "$srcdir"/calendar "$pkgdir"/usr/share/webapps/nextcloud/apps/calendar
-}

Copied: nextcloud-app-calendar/repos/community-staging-any/PKGBUILD (from rev 
1196298, nextcloud-app-calendar/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 20:18:03 UTC (rev 1196299)
@@ -0,0 +1,91 @@
+# Maintainer: Sergej Pupykin 
+
+pkgname=nextcloud-app-calendar
+_name=calendar
+epoch=1
+pkgver=3.3.0
+pkgrel=3
+pkgdesc="Calendar app for nextcloud"
+arch=('any')
+url="https://github.com/nextcloud/calendar/";
+license=('AGPL')
+depends=('nextcloud')
+makedepends=('ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/calendar/releases/download/v$pkgver/calendar-v$pkgver.tar.gz";)
+sha256sums=('9f227c554bdfb731db486a51d763f7b65dd0451dc58a888460c949ec36713c98')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-versi

[arch-commits] Commit in nextcloud-app-calendar/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:17:55
  Author: dvzrv
Revision: 1196298

upgpkg: nextcloud-app-calendar 1:3.3.0-3: Rebuild to fix issues in version 
detection for php-interpreter.

Modified:
  nextcloud-app-calendar/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 20:06:17 UTC (rev 1196297)
+++ PKGBUILD2022-05-08 20:17:55 UTC (rev 1196298)
@@ -4,7 +4,7 @@
 _name=calendar
 epoch=1
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Calendar app for nextcloud"
 arch=('any')
 url="https://github.com/nextcloud/calendar/";
@@ -26,7 +26,12 @@
   local _phps=(php7 php)
 
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g' | awk -F '.' '{print $1"."$2+1}')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
   _system_php=""
   for _php in "${_phps[@]}"; do
 if command -v "$_php" > /dev/null; then
@@ -55,8 +60,8 @@
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+if [[ "$(vercmp "$_php_version" "$_app_max_php")" -ge 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
   exit 1
 fi
   fi



[arch-commits] Commit in nextcloud-app-deck/repos/community-staging-any (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:06:17
  Author: dvzrv
Revision: 1196297

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-deck/repos/community-staging-any/PKGBUILD
(from rev 1196296, nextcloud-app-deck/trunk/PKGBUILD)
Deleted:
  nextcloud-app-deck/repos/community-staging-any/PKGBUILD

--+
 PKGBUILD |  175 -
 1 file changed, 94 insertions(+), 81 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 20:06:09 UTC (rev 1196296)
+++ PKGBUILD2022-05-08 20:06:17 UTC (rev 1196297)
@@ -1,81 +0,0 @@
-# Maintainer: David Runge 
-# Contributor: Jonas Heinrich 
-
-pkgname=nextcloud-app-deck
-_name=deck
-pkgver=1.7.0
-pkgrel=1
-# upstream doesn't adhere to semver:
-# https://github.com/nextcloud/deck/issues/1197
-epoch=1
-pkgdesc="Kanban style organization tool aimed at personal planning and project 
organization"
-arch=(any)
-url="https://github.com/nextcloud/deck";
-license=(AGPL3)
-groups=(nextcloud-apps)
-makedepends=(nextcloud ripgrep yq)
-source=($_name-$pkgver.tar.gz::https://github.com/nextcloud/$_name/releases/download/v$pkgver/$_name.tar.gz)
-sha512sums=('cf8a74e6469be2bf143ce4a3e4065384c014080b996f9e4877333a308ce7c29af43502399e88be824ca37aeb85b208d149c3425dda7ea7445f7f1a2f660bff54')
-b2sums=('586dbaf964fd9b14115b0042f79347fd527e15c7faaf01b2e90e0bc40136e42598a8dc3b701fe09aecdf8047de9ab7c0e229ddc0246610768612d5b99400d89b')
-
-_get_nextcloud_versions() {
-  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
-}
-
-_get_php_versions() {
-  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-}
-
-check() {
-  local _app_min_major_version
-  local _app_max_major_version
-  _get_nextcloud_versions
-  _get_php_versions
-
-  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
-  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
-printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
-exit 1
-  fi
-
-  local _php_version="$(php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
-  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-exit 1
-  fi
-  if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php <= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-  exit 1
-fi
-  fi
-}
-
-package() {
-  _get_nextcloud_versions
-  _get_php_versions
-
-  depends=(
-"nextcloud>=$_app_min_major_version"
-"nextcloud<$_app_max_major_version"
-  )
-  if [[ "$_app_min_php" != 'null' ]]; then
-depends+=(
-  "php>=$_app_min_php"
-)
-  fi
-  if [[ "$_app_max_php" != 'null' ]]; then
-depends+=(
-  "php<=$_app_max_php"
-)
-  fi
-  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php)
-  fi
-
-  install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps/"
-  cp -av "${_name}" "${pkgdir}/usr/share/webapps/nextcloud/apps/"
-}

Copied: nextcloud-app-deck/repos/community-staging-any/PKGBUILD (from rev 
1196296, nextcloud-app-deck/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 20:06:17 UTC (rev 1196297)
@@ -0,0 +1,94 @@
+# Maintainer: David Runge 
+# Contributor: Jonas Heinrich 
+
+pkgname=nextcloud-app-deck
+_name=deck
+pkgver=1.7.0
+pkgrel=2
+# upstream doesn't adhere to semver:
+# https://github.com/nextcloud/deck/issues/1197
+epoch=1
+pkgdesc="Kanban style organization tool aimed at personal planning and project 
organization"
+arch=(any)
+url="https://github.com/nextcloud/deck";
+license=(AGPL3)
+groups=(nextcloud-apps)
+makedepends=(nextcloud ripgrep yq)
+source=($_name-$pkgver.tar.gz::https://github.com/nextcloud/$_name/releases/download/v$pkgver/$_name.tar.gz)
+sha512sums=('cf8a74e6469be2bf143ce4a3e4065384c014080b996f9e4877333a308ce7c29af43502399e88be824ca37aeb85b208d149c3425dda7ea7445f7f1a2f660bff54')
+b2sums=('586dbaf964fd9b14115b0042f79347fd527e15c7faaf01b2e90e0bc40136e42598a8dc3b701fe09aecdf8047de9ab7c0e229

[arch-commits] Commit in nextcloud-app-deck/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 20:06:09
  Author: dvzrv
Revision: 1196296

upgpkg: nextcloud-app-deck 1:1.7.0-2: Rebuild to add more specific dependency 
on php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-deck/trunk/PKGBUILD

--+
 PKGBUILD |   27 ---
 1 file changed, 20 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:59:47 UTC (rev 1196295)
+++ PKGBUILD2022-05-08 20:06:09 UTC (rev 1196296)
@@ -4,7 +4,7 @@
 pkgname=nextcloud-app-deck
 _name=deck
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 # upstream doesn't adhere to semver:
 # https://github.com/nextcloud/deck/issues/1197
 epoch=1
@@ -25,8 +25,21 @@
 }
 
 _get_php_versions() {
+  local _phps=(php7 php)
+
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
   _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
 }
 
 check() {
@@ -43,12 +56,12 @@
 
   local _php_version="$(php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
   if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php <= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_max_php $_php_version
   exit 1
 fi
   fi
@@ -64,16 +77,16 @@
   )
   if [[ "$_app_min_php" != 'null' ]]; then
 depends+=(
-  "php>=$_app_min_php"
+  "php-interpreter>=$_app_min_php"
 )
   fi
   if [[ "$_app_max_php" != 'null' ]]; then
 depends+=(
-  "php<=$_app_max_php"
+  "php-interpreter<$_app_max_php"
 )
   fi
   if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php)
+depends+=(php-interpreter)
   fi
 
   install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps/"



[arch-commits] Commit in nextcloud-app-contacts/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:59:47
  Author: dvzrv
Revision: 1196295

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-contacts/repos/community-staging-any/
  nextcloud-app-contacts/repos/community-staging-any/PKGBUILD
(from rev 1196294, nextcloud-app-contacts/trunk/PKGBUILD)

--+
 PKGBUILD |   88 +
 1 file changed, 88 insertions(+)

Copied: nextcloud-app-contacts/repos/community-staging-any/PKGBUILD (from rev 
1196294, nextcloud-app-contacts/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 19:59:47 UTC (rev 1196295)
@@ -0,0 +1,88 @@
+# Maintainer: Sergej Pupykin 
+
+pkgname=nextcloud-app-contacts
+pkgver=4.1.0
+_name=contacts
+pkgrel=2
+pkgdesc="Contacts app for nextcloud"
+arch=('any')
+url="https://github.com/nextcloud/contacts/";
+license=('GPL')
+depends=('nextcloud')
+makedepends=('ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/contacts/releases/download/v$pkgver/contacts-v$pkgver.tar.gz";)
+sha256sums=('8c69a60e9b7b8e8c81a4be06d1e2f95180e7556e9074b7add07ee48618ea6d20')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+  _get_php_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
+  cp -a "$srcdir"/${_name} "$pkgdir"/usr/share/webapps/nextcloud/apps/contacts
+}



[arch-commits] Commit in nextcloud-app-contacts/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:59:40
  Author: dvzrv
Revision: 1196294

upgpkg: nextcloud-app-contacts 4.1.0-2: Rebuild to add more specific dependency 
on php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-contacts/trunk/PKGBUILD

--+
 PKGBUILD |   49 -
 1 file changed, 48 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:56:02 UTC (rev 1196293)
+++ PKGBUILD2022-05-08 19:59:40 UTC (rev 1196294)
@@ -3,7 +3,7 @@
 pkgname=nextcloud-app-contacts
 pkgver=4.1.0
 _name=contacts
-pkgrel=1
+pkgrel=2
 pkgdesc="Contacts app for nextcloud"
 arch=('any')
 url="https://github.com/nextcloud/contacts/";
@@ -21,10 +21,29 @@
   _app_max_major_version=$(expr ${_app_max_major_version} + 1)
 }
 
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
 check() {
   local _app_min_major_version
   local _app_max_major_version
   _get_nextcloud_versions
+  _get_php_versions
 
   local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
@@ -31,11 +50,39 @@
 printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
 exit 1
   fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+  exit 1
+fi
+  fi
 }
 
 package() {
   _get_nextcloud_versions
+  _get_php_versions
+
   depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
   install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
   cp -a "$srcdir"/${_name} "$pkgdir"/usr/share/webapps/nextcloud/apps/contacts
 }



[arch-commits] Commit in nextcloud-app-bookmarks/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:56:02
  Author: dvzrv
Revision: 1196293

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-bookmarks/repos/community-staging-any/
  nextcloud-app-bookmarks/repos/community-staging-any/PKGBUILD
(from rev 1196292, nextcloud-app-bookmarks/trunk/PKGBUILD)

--+
 PKGBUILD |   91 +
 1 file changed, 91 insertions(+)

Copied: nextcloud-app-bookmarks/repos/community-staging-any/PKGBUILD (from rev 
1196292, nextcloud-app-bookmarks/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 19:56:02 UTC (rev 1196293)
@@ -0,0 +1,91 @@
+# Maintainer: Sergej Pupykin 
+
+pkgname=nextcloud-app-bookmarks
+_name=bookmarks
+epoch=1
+pkgver=10.3.1
+pkgrel=3
+pkgdesc="Bookmarks app for nextcloud"
+arch=(any)
+url="https://github.com/nextcloud/bookmarks";
+license=(AGPL3)
+depends=(nextcloud)
+makedepends=(ripgrep yq)
+groups=(nextcloud-apps)
+options=(!strip)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/bookmarks/releases/download/v$pkgver/bookmarks-$pkgver.tar.gz";)
+sha256sums=('96f19ed9e1f7175745b527e1673e53bea0ccc84f212fb0e10330953dffa075c4')
+b2sums=('d1de66aa827594710e2659396db75ef98cbdf15a5cd16d627960eef9930e9613a8bde2fd8338e3df53184f45cb3ab17418b5273e4490ebf324763a623609ab39')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
+  cp -a "$srcdir"/bookmarks 
"$pkgdir"/usr/share/webapps/nextcloud/apps/bookmarks
+}



[arch-commits] Commit in nextcloud-app-bookmarks/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:54:42
  Author: dvzrv
Revision: 1196292

upgpkg: nextcloud-app-bookmarks 1:10.3.1-3: Rebuild to add versioned dependency 
constraint on php-interpreter.

Modified:
  nextcloud-app-bookmarks/trunk/PKGBUILD

--+
 PKGBUILD |   36 +++-
 1 file changed, 31 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:45:06 UTC (rev 1196291)
+++ PKGBUILD2022-05-08 19:54:42 UTC (rev 1196292)
@@ -4,7 +4,7 @@
 _name=bookmarks
 epoch=1
 pkgver=10.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Bookmarks app for nextcloud"
 arch=(any)
 url="https://github.com/nextcloud/bookmarks";
@@ -24,11 +24,25 @@
 }
 
 _get_php_versions() {
+  local _phps=(php7 php)
+
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
   _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
 }
 
-
 check() {
   local _app_min_major_version
   local _app_max_major_version
@@ -39,6 +53,18 @@
 printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
 exit 1
   fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
+  exit 1
+fi
+  fi
 }
 
 package() {
@@ -48,16 +74,16 @@
   depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
   if [[ "$_app_min_php" != 'null' ]]; then
 depends+=(
-  "php>=$_app_min_php"
+  "php-interpreter>=$_app_min_php"
 )
   fi
   if [[ "$_app_max_php" != 'null' ]]; then
 depends+=(
-  "php<=$_app_max_php"
+  "php-interpreter<$_app_max_php"
 )
   fi
   if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php)
+depends+=(php-interpreter)
   fi
 
   install -d "$pkgdir"/usr/share/webapps/nextcloud/apps



[arch-commits] Commit in nextcloud-app-spreed/repos/community-staging-any (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:45:06
  Author: dvzrv
Revision: 1196291

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-spreed/repos/community-staging-any/PKGBUILD
(from rev 1196290, nextcloud-app-spreed/trunk/PKGBUILD)
Deleted:
  nextcloud-app-spreed/repos/community-staging-any/PKGBUILD

--+
 PKGBUILD |  191 ++---
 1 file changed, 97 insertions(+), 94 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:44:52 UTC (rev 1196290)
+++ PKGBUILD2022-05-08 19:45:06 UTC (rev 1196291)
@@ -1,94 +0,0 @@
-# Maintainer: David Runge 
-
-_name=spreed
-pkgname=nextcloud-app-spreed
-pkgver=14.0.0
-pkgrel=1
-epoch=1
-pkgdesc="Video & audio-conferencing using WebRTC"
-arch=(any)
-url="https://apps.nextcloud.com/apps/spreed";
-license=(AGPL3)
-groups=(nextcloud-apps)
-makedepends=(nextcloud)
-checkdepends=(ripgrep yq)
-source=(https://github.com/nextcloud-releases/$_name/releases/download/v$pkgver/$_name-v$pkgver.tar.gz)
-sha512sums=('209b4d422f2b5b50ceeb5aa59751a65851ade889dbcb2577584fdca11818bd56b531545db85bafc3d0135bd6a94c3d6e5eaf82d864319c693ae5b59dd915835f')
-b2sums=('2f8064798ca371dc413055b658e2680890beb11410825ed33592caffc9babc02e1e6541e6ea090cdb966721ec3bcfbec5672ff888253378575954121d215bc24')
-
-_get_nextcloud_versions() {
-  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
-}
-
-_get_php_versions() {
-  local _phps=(php7 php)
-
-  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
-  _system_php=""
-  for _php in "${_phps[@]}"; do
-if command -v "$_php" > /dev/null; then
-  if [[ -z "$_system_php" ]]; then
-_system_php="$_php"
-  fi
-fi
-  done
-}
-
-prepare() {
-  find ${_name} -type f -exec chmod 644 {} +
-  find ${_name} -type d -exec chmod 755 {} +
-}
-
-check() {
-  local _app_min_major_version
-  local _app_max_major_version
-  _get_nextcloud_versions
-  _get_php_versions
-  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
-
-  if (("$(vercmp "$_nextcloud_major_version" "$_app_min_major_version")"<0)) 
|| (("$(vercmp "$_nextcloud_major_version" "$_app_max_major_version")">0)) ; 
then
-printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "$_app_min_major_version" "$_app_max_major_version" 
"$_nextcloud_major_version"
-exit 1
-  fi
-
-  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
-  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-exit 1
-  fi
-  if [[ $_app_max_php != 'null' ]]; then
-if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php <= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
-  exit 1
-fi
-  fi
-}
-
-package() {
-  _get_nextcloud_versions
-  _get_php_versions
-
-  depends=(
-"nextcloud>=$_app_min_major_version"
-"nextcloud<$_app_max_major_version"
-  )
-  if [[ "$_app_min_php" != 'null' ]]; then
-depends+=(
-  "php>=$_app_min_php"
-)
-  fi
-  if [[ "$_app_max_php" != 'null' ]]; then
-depends+=(
-  "php<=$_app_max_php"
-)
-  fi
-  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php)
-  fi
-
-  install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"
-  cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/"
-}

Copied: nextcloud-app-spreed/repos/community-staging-any/PKGBUILD (from rev 
1196290, nextcloud-app-spreed/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:45:06 UTC (rev 1196291)
@@ -0,0 +1,97 @@
+# Maintainer: David Runge 
+
+_name=spreed
+pkgname=nextcloud-app-spreed
+pkgver=14.0.1
+pkgrel=1
+epoch=1
+pkgdesc="Video & audio-conferencing using WebRTC"
+arch=(any)
+url="https://apps.nextcloud.com/apps/spreed";
+license=(AGPL3)
+groups=(nextcloud-apps)
+makedepends=(nextcloud)
+checkdepends=(ripgrep yq)
+source=(https://github.com/nextcloud-releases/$_name/releases/download/v$pkgver/$_name-v$pkgver.tar.gz)
+sha512sums=('b3467aa5d77900ab8d1a2c302128d06668889212b9598bc455a3ef69fcf5702d4f999df3ac107febe9d6e7b80fd23b3cbec3545e9490238882b329c6a06e3e04')
+b2sums=('bb1e05dd2593ec8f78e7c8fcd8aa3ad1e7fe5bf2aeb4f0336744d90969151e61f3cd946a01

[arch-commits] Commit in nextcloud-app-spreed/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:44:52
  Author: dvzrv
Revision: 1196290

upgpkg: nextcloud-app-spreed 1:14.0.1-1: Rebuild to add more specific 
dependency on php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-spreed/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:44:06 UTC (rev 1196289)
+++ PKGBUILD2022-05-08 19:44:52 UTC (rev 1196290)
@@ -2,7 +2,7 @@
 
 _name=spreed
 pkgname=nextcloud-app-spreed
-pkgver=14.0.0
+pkgver=14.0.1
 pkgrel=1
 epoch=1
 pkgdesc="Video & audio-conferencing using WebRTC"
@@ -13,8 +13,8 @@
 makedepends=(nextcloud)
 checkdepends=(ripgrep yq)
 
source=(https://github.com/nextcloud-releases/$_name/releases/download/v$pkgver/$_name-v$pkgver.tar.gz)
-sha512sums=('209b4d422f2b5b50ceeb5aa59751a65851ade889dbcb2577584fdca11818bd56b531545db85bafc3d0135bd6a94c3d6e5eaf82d864319c693ae5b59dd915835f')
-b2sums=('2f8064798ca371dc413055b658e2680890beb11410825ed33592caffc9babc02e1e6541e6ea090cdb966721ec3bcfbec5672ff888253378575954121d215bc24')
+sha512sums=('b3467aa5d77900ab8d1a2c302128d06668889212b9598bc455a3ef69fcf5702d4f999df3ac107febe9d6e7b80fd23b3cbec3545e9490238882b329c6a06e3e04')
+b2sums=('bb1e05dd2593ec8f78e7c8fcd8aa3ad1e7fe5bf2aeb4f0336744d90969151e61f3cd946a019ff871773d2d678b6e2e260eb7a69736c77e812c8018d1d17a48eb')
 
 _get_nextcloud_versions() {
   _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
@@ -27,6 +27,9 @@
 
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
   _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  if [[ $_app_max_php != 'null' ]]; then
+_app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
   _system_php=""
   for _php in "${_phps[@]}"; do
 if command -v "$_php" > /dev/null; then
@@ -56,12 +59,12 @@
 
   local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
   if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-printf "%s requires php >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
 exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
 if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-  printf "%s requires php <= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+  printf "%s requires php-interpreter <= %s, but %s is provided\n" 
$pkgname $_app_min_php $_php_version
   exit 1
 fi
   fi
@@ -77,16 +80,16 @@
   )
   if [[ "$_app_min_php" != 'null' ]]; then
 depends+=(
-  "php>=$_app_min_php"
+  "php-interpreter>=$_app_min_php"
 )
   fi
   if [[ "$_app_max_php" != 'null' ]]; then
 depends+=(
-  "php<=$_app_max_php"
+  "php-interpreter<$_app_max_php"
 )
   fi
   if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
-depends+=(php)
+depends+=(php-interpreter)
   fi
 
   install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"



[arch-commits] Commit in go-md2man/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:43:15
  Author: foxboron
Revision: 1196288

archrelease: copy trunk to community-x86_64

Added:
  go-md2man/repos/community-x86_64/PKGBUILD
(from rev 1196287, go-md2man/trunk/PKGBUILD)
Deleted:
  go-md2man/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   56 
 1 file changed, 28 insertions(+), 28 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:43:10 UTC (rev 1196287)
+++ PKGBUILD2022-05-08 19:43:15 UTC (rev 1196288)
@@ -1,28 +0,0 @@
-# Maintainer: Morten Linderud 
-# Contributor: Sébastien "Seblu" Luttringer 
-
-pkgname=go-md2man
-pkgver=2.0.2
-pkgrel=1
-pkgdesc='A markdown to manpage generator'
-arch=('x86_64')
-url='https://github.com/cpuguy83/go-md2man'
-license=('MIT')
-makedepends=('go')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/cpuguy83/go-md2man/archive/v$pkgver.tar.gz";)
-sha256sums=('2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  export GOFLAGS="-buildmode=pie -mod=vendor -trimpath"
-  export CGO_LDFLAGS="$LDFLAGS"
-  go build -o go-md2man .
-  ./go-md2man -in=go-md2man.1.md -out=go-md2man.1
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  install -Dm755 go-md2man "$pkgdir/usr/bin/go-md2man"
-  install -Dm755 go-md2man.1 "$pkgdir/usr/share/man/man1/go-md2man.1"
-  install -Dm755 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: go-md2man/repos/community-x86_64/PKGBUILD (from rev 1196287, 
go-md2man/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:43:15 UTC (rev 1196288)
@@ -0,0 +1,28 @@
+# Maintainer: Morten Linderud 
+# Contributor: Sébastien "Seblu" Luttringer 
+
+pkgname=go-md2man
+pkgver=2.0.2
+pkgrel=2
+pkgdesc='A markdown to manpage generator'
+arch=('x86_64')
+url='https://github.com/cpuguy83/go-md2man'
+license=('MIT')
+makedepends=('go')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/cpuguy83/go-md2man/archive/v$pkgver.tar.gz";)
+sha256sums=('2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a')
+
+build() {
+  cd "$pkgname-$pkgver"
+  export GOFLAGS="-buildmode=pie -mod=vendor -trimpath"
+  export CGO_LDFLAGS="$LDFLAGS"
+  go build -o go-md2man .
+  ./go-md2man -in=go-md2man.1.md -out=go-md2man.1
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  install -Dm755 go-md2man "$pkgdir/usr/bin/go-md2man"
+  install -Dm755 go-md2man.1 "$pkgdir/usr/share/man/man1/go-md2man.1"
+  install -Dm755 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}



[arch-commits] Commit in go-md2man/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:43:10
  Author: foxboron
Revision: 1196287

upgpkg: go-md2man 2.0.2-2: upgpkg: go-md2man 2.0.2-2 - go 1.18 rebuild

Modified:
  go-md2man/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:42:06 UTC (rev 1196286)
+++ PKGBUILD2022-05-08 19:43:10 UTC (rev 1196287)
@@ -3,7 +3,7 @@
 
 pkgname=go-md2man
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A markdown to manpage generator'
 arch=('x86_64')
 url='https://github.com/cpuguy83/go-md2man'



[arch-commits] Commit in git-lfs/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:42:06
  Author: foxboron
Revision: 1196286

archrelease: copy trunk to community-x86_64

Added:
  git-lfs/repos/community-x86_64/PKGBUILD
(from rev 1196285, git-lfs/trunk/PKGBUILD)
Deleted:
  git-lfs/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   78 ++---
 1 file changed, 39 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:41:56 UTC (rev 1196285)
+++ PKGBUILD2022-05-08 19:42:06 UTC (rev 1196286)
@@ -1,39 +0,0 @@
-# Maintainer: Morten Linderud 
-
-pkgname=git-lfs
-pkgver=3.1.4
-pkgrel=1
-pkgdesc="Git extension for versioning large files"
-arch=('x86_64')
-url="https://git-lfs.github.com";
-license=('MIT')
-makedepends=('go' 'ruby-ronn' 'go-tools')
-depends=('git')
-source=("git+https://github.com/git-lfs/git-lfs.git#tag=v${pkgver}?signed";)
-validpgpkeys=('88ACE9B29196305BA9947552F1BA225C0223B187') # brian m. carlson 

-sha256sums=('SKIP')
-
-build(){
-  cd "$pkgname"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -mod=vendor -modcacherw 
-ldflags=-linkmode=external"
-  go generate ./commands
-  go build .
-  make man
-}
-
-check(){
-  cd "$pkgname"
-  go test -mod=vendor ./...
-}
-
-package() {
-  cd "$pkgname"
-  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-  install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/*.1
-  install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
-}

Copied: git-lfs/repos/community-x86_64/PKGBUILD (from rev 1196285, 
git-lfs/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:42:06 UTC (rev 1196286)
@@ -0,0 +1,39 @@
+# Maintainer: Morten Linderud 
+
+pkgname=git-lfs
+pkgver=3.1.4
+pkgrel=2
+pkgdesc="Git extension for versioning large files"
+arch=('x86_64')
+url="https://git-lfs.github.com";
+license=('MIT')
+makedepends=('go' 'ruby-ronn' 'go-tools')
+depends=('git')
+source=("git+https://github.com/git-lfs/git-lfs.git#tag=v${pkgver}?signed";)
+validpgpkeys=('88ACE9B29196305BA9947552F1BA225C0223B187') # brian m. carlson 

+sha256sums=('SKIP')
+
+build(){
+  cd "$pkgname"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=vendor -modcacherw 
-ldflags=-linkmode=external"
+  go generate ./commands
+  go build .
+  make man
+}
+
+check(){
+  cd "$pkgname"
+  go test -mod=vendor ./...
+}
+
+package() {
+  cd "$pkgname"
+  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+  install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/*.1
+  install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
+}



[arch-commits] Commit in git-lfs/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:41:56
  Author: foxboron
Revision: 1196285

upgpkg: git-lfs 3.1.4-2: upgpkg: git-lfs 3.1.4-2

Modified:
  git-lfs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:40:13 UTC (rev 1196284)
+++ PKGBUILD2022-05-08 19:41:56 UTC (rev 1196285)
@@ -2,7 +2,7 @@
 
 pkgname=git-lfs
 pkgver=3.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Git extension for versioning large files"
 arch=('x86_64')
 url="https://git-lfs.github.com";



[arch-commits] Commit in docker-scan/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:40:13
  Author: foxboron
Revision: 1196284

archrelease: copy trunk to community-x86_64

Added:
  docker-scan/repos/community-x86_64/PKGBUILD
(from rev 1196283, docker-scan/trunk/PKGBUILD)
Deleted:
  docker-scan/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   84 ++---
 1 file changed, 42 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:40:08 UTC (rev 1196283)
+++ PKGBUILD2022-05-08 19:40:13 UTC (rev 1196284)
@@ -1,42 +0,0 @@
-# Maintainer: Morten Linderud 
-
-pkgname=docker-scan
-pkgver=0.17.0
-pkgrel=1
-pkgdesc="Docker Scan is a Command Line Interface to run vulnerability 
detection on your Dockerfiles and Docker images"
-arch=('x86_64')
-url="https://github.com/docker/scan-cli-plugin";
-license=("Apache")
-makedepends=('go' 'git')
-_commit=061fe0a0c54762676295afce4ae5e31efd85b99b   #refs/tags/v0.17.0
-source=("git+https://github.com/docker/scan-cli-plugin.git#commit=${_commit}";)
-sha512sums=('SKIP')
-
-pkgver() {
-  cd "scan-cli-plugin"
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
-  cd "scan-cli-plugin"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
-  make -f builder.Makefile build
-}
-
-check(){
-  cd "scan-cli-plugin"
-  # mkdir cli-plugins
-  # cp bin/docker-scan_linux_amd64 cli-plugins/docker-scan
-  # export DOCKER_CONFIG="$(PWD)"
-  # go test ./...
-}
-
-package() {
-  cd "scan-cli-plugin"
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm755 bin/docker-scan_linux_amd64 
"$pkgdir"/usr/lib/docker/cli-plugins/docker-scan
-}

Copied: docker-scan/repos/community-x86_64/PKGBUILD (from rev 1196283, 
docker-scan/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:40:13 UTC (rev 1196284)
@@ -0,0 +1,42 @@
+# Maintainer: Morten Linderud 
+
+pkgname=docker-scan
+pkgver=0.17.0
+pkgrel=2
+pkgdesc="Docker Scan is a Command Line Interface to run vulnerability 
detection on your Dockerfiles and Docker images"
+arch=('x86_64')
+url="https://github.com/docker/scan-cli-plugin";
+license=("Apache")
+makedepends=('go' 'git')
+_commit=061fe0a0c54762676295afce4ae5e31efd85b99b   #refs/tags/v0.17.0
+source=("git+https://github.com/docker/scan-cli-plugin.git#commit=${_commit}";)
+sha512sums=('SKIP')
+
+pkgver() {
+  cd "scan-cli-plugin"
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+build() {
+  cd "scan-cli-plugin"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
+  make -f builder.Makefile build
+}
+
+check(){
+  cd "scan-cli-plugin"
+  # mkdir cli-plugins
+  # cp bin/docker-scan_linux_amd64 cli-plugins/docker-scan
+  # export DOCKER_CONFIG="$(PWD)"
+  # go test ./...
+}
+
+package() {
+  cd "scan-cli-plugin"
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm755 bin/docker-scan_linux_amd64 
"$pkgdir"/usr/lib/docker/cli-plugins/docker-scan
+}



[arch-commits] Commit in docker-scan/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:40:08
  Author: foxboron
Revision: 1196283

upgpkg: docker-scan 0.17.0-2: upgpkg: docker-scan 0.17.0-2 - go 1.18 rebuild

Modified:
  docker-scan/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:39:03 UTC (rev 1196282)
+++ PKGBUILD2022-05-08 19:40:08 UTC (rev 1196283)
@@ -2,7 +2,7 @@
 
 pkgname=docker-scan
 pkgver=0.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Docker Scan is a Command Line Interface to run vulnerability 
detection on your Dockerfiles and Docker images"
 arch=('x86_64')
 url="https://github.com/docker/scan-cli-plugin";



[arch-commits] Commit in grobi/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:39:03
  Author: foxboron
Revision: 1196282

archrelease: copy trunk to community-x86_64

Added:
  grobi/repos/community-x86_64/PKGBUILD
(from rev 1196281, grobi/trunk/PKGBUILD)
Deleted:
  grobi/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   88 ++---
 1 file changed, 44 insertions(+), 44 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:38:57 UTC (rev 1196281)
+++ PKGBUILD2022-05-08 19:39:03 UTC (rev 1196282)
@@ -1,44 +0,0 @@
-pkgname=grobi
-pkgver=0.6.0
-pkgrel=2
-pkgdesc='Automatically configure monitors/outputs for Xorg via RANDR'
-arch=('x86_64')
-url='https://github.com/fd0/grobi'
-license=('BSD')
-makedepends=('go')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/fd0/grobi/archive/refs/tags/v$pkgver.tar.gz";
-"fix-test.patch::https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
-"fix-edid-junk.patch::https://github.com/fd0/grobi/pull/33.patch";
-)
-sha256sums=('846cc199ca9e5a223b923f517e4f1c42e9f78553fe12b83788c327083b95c519'
-'d549e83b067540d15d56d93350c3561c74f91132bdf63cde8fd8aeab5bcb8176'
-'d34f78816fa0a5b48fc0e5fe68d27087311768f9759dfdd7af82ff23b31acf7e')
-
-prepare(){
-  cd "$pkgname-$pkgver"
-  mkdir -p build/
-
-  patch -Np1 < ../fix-test.patch
-  patch -Np1 < ../fix-edid-junk.patch
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external 
-mod=readonly -modcacherw"
-  go build -o build .
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  go test ./...
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  install -Dm755 build/$pkgname "$pkgdir"/usr/bin/$pkgname
-  install -Dm644 doc/grobi.service 
"$pkgdir"/usr/lib/systemd/user/$pkgname.service
-}

Copied: grobi/repos/community-x86_64/PKGBUILD (from rev 1196281, 
grobi/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:39:03 UTC (rev 1196282)
@@ -0,0 +1,44 @@
+pkgname=grobi
+pkgver=0.6.0
+pkgrel=3
+pkgdesc='Automatically configure monitors/outputs for Xorg via RANDR'
+arch=('x86_64')
+url='https://github.com/fd0/grobi'
+license=('BSD')
+makedepends=('go')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/fd0/grobi/archive/refs/tags/v$pkgver.tar.gz";
+"$pkgname-fix-test.patch::https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
+"$pkgname-fix-edid-junk.patch::https://github.com/fd0/grobi/pull/33.patch";
+)
+sha256sums=('846cc199ca9e5a223b923f517e4f1c42e9f78553fe12b83788c327083b95c519'
+'d549e83b067540d15d56d93350c3561c74f91132bdf63cde8fd8aeab5bcb8176'
+'d34f78816fa0a5b48fc0e5fe68d27087311768f9759dfdd7af82ff23b31acf7e')
+
+prepare(){
+  cd "$pkgname-$pkgver"
+  mkdir -p build/
+
+  patch -Np1 < "$srcdir/grobi-fix-test.patch"
+  patch -Np1 < "$srcdir/grobi-fix-edid-junk.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external 
-mod=readonly -modcacherw"
+  go build -o build .
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  go test ./...
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  install -Dm755 build/$pkgname "$pkgdir"/usr/bin/$pkgname
+  install -Dm644 doc/grobi.service 
"$pkgdir"/usr/lib/systemd/user/$pkgname.service
+}



[arch-commits] Commit in grobi/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:38:57
  Author: foxboron
Revision: 1196281

upgpkg: grobi 0.6.0-3: upgpkg: grobi 0.6.0-3

Modified:
  grobi/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:37:55 UTC (rev 1196280)
+++ PKGBUILD2022-05-08 19:38:57 UTC (rev 1196281)
@@ -1,6 +1,6 @@
 pkgname=grobi
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Automatically configure monitors/outputs for Xorg via RANDR'
 arch=('x86_64')
 url='https://github.com/fd0/grobi'
@@ -7,8 +7,8 @@
 license=('BSD')
 makedepends=('go')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/fd0/grobi/archive/refs/tags/v$pkgver.tar.gz";
-"fix-test.patch::https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
-"fix-edid-junk.patch::https://github.com/fd0/grobi/pull/33.patch";
+"$pkgname-fix-test.patch::https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
+"$pkgname-fix-edid-junk.patch::https://github.com/fd0/grobi/pull/33.patch";
 )
 sha256sums=('846cc199ca9e5a223b923f517e4f1c42e9f78553fe12b83788c327083b95c519'
 'd549e83b067540d15d56d93350c3561c74f91132bdf63cde8fd8aeab5bcb8176'
@@ -18,8 +18,8 @@
   cd "$pkgname-$pkgver"
   mkdir -p build/
 
-  patch -Np1 < ../fix-test.patch
-  patch -Np1 < ../fix-edid-junk.patch
+  patch -Np1 < "$srcdir/grobi-fix-test.patch"
+  patch -Np1 < "$srcdir/grobi-fix-edid-junk.patch"
 }
 
 build() {



[arch-commits] Commit in nextcloud-app-calendar/repos (2 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:37:55
  Author: dvzrv
Revision: 1196280

archrelease: copy trunk to community-staging-any

Added:
  nextcloud-app-calendar/repos/community-staging-any/
  nextcloud-app-calendar/repos/community-staging-any/PKGBUILD
(from rev 1196279, nextcloud-app-calendar/trunk/PKGBUILD)

--+
 PKGBUILD |   86 +
 1 file changed, 86 insertions(+)

Copied: nextcloud-app-calendar/repos/community-staging-any/PKGBUILD (from rev 
1196279, nextcloud-app-calendar/trunk/PKGBUILD)
===
--- community-staging-any/PKGBUILD  (rev 0)
+++ community-staging-any/PKGBUILD  2022-05-08 19:37:55 UTC (rev 1196280)
@@ -0,0 +1,86 @@
+# Maintainer: Sergej Pupykin 
+
+pkgname=nextcloud-app-calendar
+_name=calendar
+epoch=1
+pkgver=3.3.0
+pkgrel=2
+pkgdesc="Calendar app for nextcloud"
+arch=('any')
+url="https://github.com/nextcloud/calendar/";
+license=('AGPL')
+depends=('nextcloud')
+makedepends=('ripgrep' 'yq')
+groups=('nextcloud-apps')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/calendar/releases/download/v$pkgver/calendar-v$pkgver.tar.gz";)
+sha256sums=('9f227c554bdfb731db486a51d763f7b65dd0451dc58a888460c949ec36713c98')
+
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' 
"${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g' | awk -F '.' '{print $1"."$2+1}')"
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
+check() {
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+  _get_php_versions
+
+  local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
+  if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
+printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
+exit 1
+  fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+  exit 1
+fi
+  fi
+}
+
+package() {
+  _get_nextcloud_versions
+  _get_php_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
+
+  install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
+  cp -a "$srcdir"/calendar "$pkgdir"/usr/share/webapps/nextcloud/apps/calendar
+}



[arch-commits] Commit in nextcloud-app-calendar/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:37:48
  Author: dvzrv
Revision: 1196279

upgpkg: nextcloud-app-calendar 1:3.3.0-2: Rebuild to add more specific 
dependency on php-interpreter.

Implement a versioned dependency on php-interpreter.

Modified:
  nextcloud-app-calendar/trunk/PKGBUILD

--+
 PKGBUILD |   45 -
 1 file changed, 44 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:35:17 UTC (rev 1196278)
+++ PKGBUILD2022-05-08 19:37:48 UTC (rev 1196279)
@@ -4,7 +4,7 @@
 _name=calendar
 epoch=1
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Calendar app for nextcloud"
 arch=('any')
 url="https://github.com/nextcloud/calendar/";
@@ -22,10 +22,26 @@
   _app_max_major_version=$(expr ${_app_max_major_version} + 1)
 }
 
+_get_php_versions() {
+  local _phps=(php7 php)
+
+  _app_min_php="$(xq '.info.dependencies.php["@min-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' 
"$_name/appinfo/info.xml"| sed 's/"//g' | awk -F '.' '{print $1"."$2+1}')"
+  _system_php=""
+  for _php in "${_phps[@]}"; do
+if command -v "$_php" > /dev/null; then
+  if [[ -z "$_system_php" ]]; then
+_system_php="$_php"
+  fi
+fi
+  done
+}
+
 check() {
   local _app_min_major_version
   local _app_max_major_version
   _get_nextcloud_versions
+  _get_php_versions
 
   local _nextcloud_major_version="$(rg "OC_Version = " 
/usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" 
-lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" 
"${_app_max_major_version}")" -gt 0 ]] ; then
@@ -32,11 +48,38 @@
 printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is 
provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" 
"${_nextcloud_major_version}"
 exit 1
   fi
+
+  local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 
's/.[0-9]*$//g')"
+  if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+exit 1
+  fi
+  if [[ $_app_max_php != 'null' ]]; then
+if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
+  printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname 
$_app_min_php $_php_version
+  exit 1
+fi
+  fi
 }
 
 package() {
   _get_nextcloud_versions
+  _get_php_versions
+
   depends=("nextcloud>=${_app_min_major_version}" 
"nextcloud<${_app_max_major_version}")
+  if [[ "$_app_min_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter>=$_app_min_php"
+)
+  fi
+  if [[ "$_app_max_php" != 'null' ]]; then
+depends+=(
+  "php-interpreter<$_app_max_php"
+)
+  fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+depends+=(php-interpreter)
+  fi
 
   install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
   cp -a "$srcdir"/calendar "$pkgdir"/usr/share/webapps/nextcloud/apps/calendar



[arch-commits] Commit in archboot-arm/repos/extra-any (4 files)

2022-05-08 Thread Tobias Powalowski via arch-commits
Date: Sunday, May 8, 2022 @ 19:35:17
  Author: tpowa
Revision: 444875

archrelease: copy trunk to extra-any

Added:
  archboot-arm/repos/extra-any/PKGBUILD
(from rev 444874, archboot-arm/trunk/PKGBUILD)
  archboot-arm/repos/extra-any/archboot.install
(from rev 444874, archboot-arm/trunk/archboot.install)
Deleted:
  archboot-arm/repos/extra-any/PKGBUILD
  archboot-arm/repos/extra-any/archboot.install

--+
 PKGBUILD |  108 ++---
 archboot.install |   38 +-
 2 files changed, 73 insertions(+), 73 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:35:11 UTC (rev 444874)
+++ PKGBUILD2022-05-08 19:35:17 UTC (rev 444875)
@@ -1,54 +0,0 @@
-# Maintainer : Tobias Powalowski 
-
-pkgname=archboot-arm
-pkgver=2022.05
-pkgrel=34
-pkgdesc="Advanced, modular arch boot/install image creation utility with 
aarch64 depends"
-arch=(any)
-license=('GPL')
-url="https://wiki.archlinux.org/title/Archboot";
-depends=('mkinitcpio' 'pacman' 'wget' 'bash' 'coreutils' 'cryptsetup' 'dialog' 
'e2fsprogs' 'findutils' 'gawk' 'grep' 'iputils' 'jfsutils'
- 'less' 'lvm2' 'mdadm' 'kmod' 'nano' 'ncurses' 'net-tools' 
'gnu-netcat' 'procps-ng' 'psmisc' 'sed' 'snarf'
- 'tar' 'util-linux' 'bind' 'which' 'kbd' 'wireless_tools' 'xfsprogs' 
'hdparm' 'inetutils'
- 'openssh' 'hwdetect' 'shadow' 'bridge-utils' 'dosfstools' 'glibc' 
'linux' 'kexec-tools' 'ppp' 'rp-pppoe'
- 'pciutils' 'usbutils' 'vpnc' 'openvpn' 'b43-fwcutter' 
'wpa_supplicant' 'rsync' 'gzip' 'libarchive'
-'device-mapper' 'screen' 'elfutils' 'pam' 'cracklib' 'nfs-utils' 
'nfsidmap' 'readline' 'acl' 'attr' 'pcre' 'cpio'
-'fuse' 'libusb' 'vim' 'vi' 'lzo' 'lzop' 'libsasl' 'libldap' 'gpm' 
'libevent' 'gcc-libs' 'sdparm' 'licenses' 'pptpclient'
-'dhcpcd' 'openssl' 'dmraid' 'linux-atm' 'netctl' 'parted' 'tzdata' 
'ntp' 'libgcrypt' 'iw' 
-'libnl' 'iproute2' 'wireless-regdb' 'dhclient' 'mtools' 'fsarchiver' 
'xz' 'libtirpc' 'rpcbind' 'testdisk'
-'wipe' 'ddrescue' 'ifplugd' 'libgssglue' 'mkinitcpio-nfs-utils' 
'gptfdisk' 'nilfs-utils' 'btrfs-progs'
-'iana-etc' 'keyutils' 'libisoburn' 'file' 'curl'  'smartmontools' 
'dnsmasq' 'cifs-utils'
-'openconnect' 'libxml2' 'libproxy' 'tcpdump' 'nmap' 'lua' 'gnutls' 
'nettle' 'libtasn1' 'expat'
-'glib2' 'freetype2' 'libssh2' 'libedit' 'talloc' 'libjpeg-turbo' 
'dmidecode' 'gnupg' 'libksba' 'libassuan' 'pinentry'
-'gpgme' 'ldns' 'dnssec-anchors' 'hwdata' 'systemd' 'haveged' 'pambase' 
'traceroute' 'grub' 
-'systemd-sysvcompat' 'arch-install-scripts' 'zsh' 'gdbm' 
'grml-zsh-config' 'cpupower' 'wvdial' 'xl2tpd' 
-'usb_modeswitch' 'efibootmgr' 'f2fs-tools' 'efitools' 'efivar' 
'ethtool' 'exfatprogs' 
-'fuse3' 'flex' 'amd-ucode' 'cdrtools' 'nvme-cli' 'fatresize' 'iwd' 
'elinks' 'weechat' 'lshw' 'tmux'
-'sbsigntools' 'openresolv' 'mokutil' 'archboot-bootloader' 
'archinstall' 'sbctl' 'gpart')
-makedepends=('git')
-optdepends=('linux-firmware: for firmware inclusion on image file'
-'linux-firmware-marvell: for marvell firmware support'
-'sudo: for running the archboot build server')
-source=("git+https://gitlab.archlinux.org/tpowa/archboot.git#tag=${pkgver}-${pkgrel}?signed";)
-backup=('etc/archboot/defaults'
-   'etc/archboot/x86_64.conf'
-'etc/archboot/aarch64.conf'
-'etc/archboot/x86_64-latest.conf'
-'etc/archboot/aarch64-latest.conf'
-   'etc/archboot/x86_64-local.conf'
-'etc/archboot/aarch64-local.conf'
-'etc/archboot/presets/x86_64'
-'etc/archboot/presets/aarch64'
-'etc/archboot/presets/x86_64-latest'
-'etc/archboot/presets/aarch64-latest'
-   'etc/archboot/presets/x86_64-local'
-'etc/archboot/presets/aarch64-local')
-install=archboot.install
-sha256sums=('SKIP')
-validgpgkeys=('5B7E3FB71B7F10329A1C03AB771DF6627EDF681F' # Tobias Powalowski 

- )
-package()
-{
-  cd "$srcdir/archboot"
-  mv etc/ usr/ "$pkgdir/"
-}

Copied: archboot-arm/repos/extra-any/PKGBUILD (from rev 444874, 
archboot-arm/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:35:17 UTC (rev 444875)
@@ -0,0 +1,54 @@
+# Maintainer : Tobias Powalowski 
+
+pkgname=archboot-arm
+pkgver=2022.05
+pkgrel=35
+pkgdesc="Advanced, modular arch boot/install image creation utility with 
aarch64 depends"
+arch=(any)
+license=('GPL')
+url="https://wiki.archlinux.org/title/Archboot";
+depends=('mkinitcpio' 'pacman' 'wget' 'bash' 'coreutils' 'cryptsetup' 'dialog' 
'e2fsprogs' 'findutils' 'gawk' 'grep' 'iputils' 'jfsutils'
+ 'less' 'lvm2' 'mdadm' 'kmod' 'nano' 'ncurses' 'net-tools' 
'gnu-netcat' 'procps-ng' 'psmisc' 'sed' 'snarf'
+ 'tar' 'util-linux' 'bind' 'w

[arch-commits] Commit in podman-dnsname/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:35:17
  Author: foxboron
Revision: 1196278

archrelease: copy trunk to community-x86_64

Added:
  podman-dnsname/repos/community-x86_64/PKGBUILD
(from rev 1196277, podman-dnsname/trunk/PKGBUILD)
Deleted:
  podman-dnsname/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   85 ++---
 1 file changed, 43 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:35:10 UTC (rev 1196277)
+++ PKGBUILD2022-05-08 19:35:17 UTC (rev 1196278)
@@ -1,42 +0,0 @@
-# Maintainer: Morten Linderud 
-
-pkgname=podman-dnsname
-_pkgname=dnsname
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="name resolution for containers"
-arch=("x86_64")
-url="https://github.com/containers/dnsname";
-license=("APACHE")
-makedepends=("git" "go")
-depends=("dnsmasq")
-_commit=18822f9a4fb35d1349eb256f4cd2bfd372474d84   #refs/tags/v1.3.1^{}
-source=("git+${url}.git#commit=${_commit}")
-validpgpkeys=("B7DBDCA456F7335E91F1C25CD3624C551D0515C4")
-sha256sums=('SKIP')
-
-pkgver() {
-cd ${_pkgname}
-git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
-  cd "${_pkgname}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export GOFLAGS="-buildmode=pie -ldflags=-linkmode=external -trimpath 
-mod=readonly -modcacherw"
-  make
-}
-
-# check() {
-#   cd "${_pkgname}"
-#   go test ./...
-# }
-
-package() {
-  cd "${_pkgname}"
-  make PREFIX="/usr" LIBEXECDIR="/usr/lib/cni" DESTDIR="${pkgdir}" install
-  install -vDm 755 "$pkgdir/usr/lib/cni/dnsname" -t "$pkgdir/opt/cni/bin/"
-}

Copied: podman-dnsname/repos/community-x86_64/PKGBUILD (from rev 1196277, 
podman-dnsname/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:35:17 UTC (rev 1196278)
@@ -0,0 +1,43 @@
+# Maintainer: Morten Linderud 
+
+pkgname=podman-dnsname
+_pkgname=dnsname
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="name resolution for containers"
+arch=("x86_64")
+url="https://github.com/containers/dnsname";
+license=("APACHE")
+makedepends=("git" "go")
+depends=("dnsmasq")
+options=(!lto)
+_commit=18822f9a4fb35d1349eb256f4cd2bfd372474d84   #refs/tags/v1.3.1^{}
+source=("git+${url}.git#commit=${_commit}")
+validpgpkeys=("B7DBDCA456F7335E91F1C25CD3624C551D0515C4")
+sha256sums=('SKIP')
+
+pkgver() {
+cd ${_pkgname}
+git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+build() {
+  cd "${_pkgname}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export GOFLAGS="-buildmode=pie -ldflags=-linkmode=external -trimpath 
-mod=readonly -modcacherw"
+  make
+}
+
+# check() {
+#   cd "${_pkgname}"
+#   go test ./...
+# }
+
+package() {
+  cd "${_pkgname}"
+  make PREFIX="/usr" LIBEXECDIR="/usr/lib/cni" DESTDIR="${pkgdir}" install
+  install -vDm 755 "$pkgdir/usr/lib/cni/dnsname" -t "$pkgdir/opt/cni/bin/"
+}



[arch-commits] Commit in podman-dnsname/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:35:10
  Author: foxboron
Revision: 1196277

upgpkg: podman-dnsname 1.3.1-2: upgpkg: podman-dnsname 1.3.1-2 - go 1.18 rebuild

Modified:
  podman-dnsname/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:32:58 UTC (rev 1196276)
+++ PKGBUILD2022-05-08 19:35:10 UTC (rev 1196277)
@@ -3,7 +3,7 @@
 pkgname=podman-dnsname
 _pkgname=dnsname
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="name resolution for containers"
 arch=("x86_64")
 url="https://github.com/containers/dnsname";
@@ -10,6 +10,7 @@
 license=("APACHE")
 makedepends=("git" "go")
 depends=("dnsmasq")
+options=(!lto)
 _commit=18822f9a4fb35d1349eb256f4cd2bfd372474d84   #refs/tags/v1.3.1^{}
 source=("git+${url}.git#commit=${_commit}")
 validpgpkeys=("B7DBDCA456F7335E91F1C25CD3624C551D0515C4")



[arch-commits] Commit in archboot-arm/trunk (PKGBUILD)

2022-05-08 Thread Tobias Powalowski via arch-commits
Date: Sunday, May 8, 2022 @ 19:35:11
  Author: tpowa
Revision: 444874

upgpkg: archboot-arm 2022.05-35: bump to latest version

Modified:
  archboot-arm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:34:20 UTC (rev 444873)
+++ PKGBUILD2022-05-08 19:35:11 UTC (rev 444874)
@@ -2,7 +2,7 @@
 
 pkgname=archboot-arm
 pkgver=2022.05
-pkgrel=34
+pkgrel=35
 pkgdesc="Advanced, modular arch boot/install image creation utility with 
aarch64 depends"
 arch=(any)
 license=('GPL')



[arch-commits] Commit in archboot/repos/extra-any (4 files)

2022-05-08 Thread Tobias Powalowski via arch-commits
Date: Sunday, May 8, 2022 @ 19:34:20
  Author: tpowa
Revision: 444873

archrelease: copy trunk to extra-any

Added:
  archboot/repos/extra-any/PKGBUILD
(from rev 444872, archboot/trunk/PKGBUILD)
  archboot/repos/extra-any/archboot.install
(from rev 444872, archboot/trunk/archboot.install)
Deleted:
  archboot/repos/extra-any/PKGBUILD
  archboot/repos/extra-any/archboot.install

--+
 PKGBUILD |  110 ++---
 archboot.install |   38 +-
 2 files changed, 74 insertions(+), 74 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:34:13 UTC (rev 444872)
+++ PKGBUILD2022-05-08 19:34:20 UTC (rev 444873)
@@ -1,55 +0,0 @@
-# Maintainer : Tobias Powalowski 
-
-pkgname=archboot
-pkgver=2022.05
-pkgrel=34
-pkgdesc="Advanced, modular arch boot/install image creation utility"
-arch=(any)
-license=('GPL')
-url="https://wiki.archlinux.org/title/Archboot";
-depends=('mkinitcpio' 'pacman' 'wget' 'bash' 'coreutils' 'cryptsetup' 'dialog' 
'e2fsprogs' 'findutils' 'gawk' 'grep' 'iputils' 'jfsutils'
- 'less' 'lvm2' 'mdadm' 'kmod' 'nano' 'ncurses' 'net-tools' 
'gnu-netcat' 'procps-ng' 'psmisc' 'sed' 'snarf'
- 'tar' 'util-linux' 'bind' 'which' 'kbd' 'wireless_tools' 'xfsprogs' 
'hdparm' 'inetutils'
- 'openssh' 'hwdetect' 'shadow' 'bridge-utils'  'dosfstools' 'glibc' 
'linux' 'kexec-tools' 'ppp' 'rp-pppoe'
- 'pciutils' 'usbutils' 'vpnc' 'openvpn' 'b43-fwcutter' 
'wpa_supplicant' 'rsync' 'gzip' 'libarchive'
-'device-mapper' 'screen' 'elfutils' 'pam' 'cracklib' 'nfs-utils' 
'nfsidmap' 'readline' 'acl' 'attr' 'pcre' 'cpio'
-'fuse' 'libusb' 'vi' 'vim' 'lzo' 'lzop' 'libsasl' 'libldap' 'gpm' 
'libevent' 'gcc-libs' 'sdparm' 'licenses' 'pptpclient' 'ipw2100-fw'
-'ipw2200-fw' 'dhcpcd' 'openssl' 'dmraid' 'linux-atm' 'netctl' 'parted' 
'tzdata' 'ntp' 'libgcrypt' 'iw' 
-'libnl' 'iproute2' 'wireless-regdb' 'dhclient' 'mtools' 'fsarchiver' 
'xz' 'libtirpc' 'rpcbind' 'testdisk'
-'wipe' 'ddrescue' 'ifplugd' 'libgssglue' 'mkinitcpio-nfs-utils' 
'gptfdisk' 'nilfs-utils' 'btrfs-progs'
-'iana-etc' 'keyutils' 'libisoburn' 'file' 'curl'  'smartmontools' 
'dnsmasq' 'cifs-utils'
-'openconnect' 'libxml2' 'libproxy' 'tcpdump' 'nmap' 'lua' 'gnutls' 
'nettle' 'libtasn1' 'expat'
-'glib2' 'freetype2' 'libssh2' 'libedit' 'talloc' 'libjpeg-turbo' 
'dmidecode' 'gnupg' 'libksba' 'libassuan' 'pinentry'
-'gpgme' 'ldns' 'dnssec-anchors' 'hwdata' 'systemd' 'archlinux-keyring' 
'haveged' 'pambase' 'chntpw' 'traceroute' 'grub' 
-'systemd-sysvcompat' 'intel-ucode' 'arch-install-scripts' 'zsh' 'gdbm' 
'grml-zsh-config' 'cpupower' 'wvdial' 'xl2tpd' 
-'usb_modeswitch' 'refind' 'efibootmgr' 'f2fs-tools' 'efitools' 
'efivar' 'ethtool' 'exfatprogs' 'broadcom-wl'
-'fuse3' 'flex' 'amd-ucode' 'edk2-shell' 'cdrtools' 'nvme-cli' 
'fatresize' 'iwd' 'elinks' 'weechat' 'lshw' 'tmux'
-'sbsigntools' 'openresolv' 'mokutil' 'archboot-bootloader' 
'archinstall' 'sbctl' 'gpart')
-makedepends=('git')
-optdepends=('linux-firmware: for firmware inclusion on image file'
-'linux-firmware-marvell: for marvell firmware support'
-'archboot-qemu-aarch64: for aarch64 image building on x86_64'
-'sudo: for running the archboot build server')
-source=("git+https://gitlab.archlinux.org/tpowa/archboot.git#tag=${pkgver}-${pkgrel}?signed";)
-backup=('etc/archboot/defaults'
-   'etc/archboot/x86_64.conf'
-'etc/archboot/aarch64.conf'
-'etc/archboot/x86_64-latest.conf'
-'etc/archboot/aarch64-latest.conf'
-'etc/archboot/x86_64-local.conf'
-   'etc/archboot/aarch64-local.conf'
-   'etc/archboot/presets/x86_64'
-'etc/archboot/presets/aarch64'
-'etc/archboot/presets/x86_64-latest'
-'etc/archboot/presets/aarch64-latest'
-   'etc/archboot/presets/x86_64-local'
-   'etc/archboot/presets/aarch64-local')
-install=archboot.install
-sha256sums=('SKIP')
-validgpgkeys=('5B7E3FB71B7F10329A1C03AB771DF6627EDF681F' # Tobias Powalowski 

- )
-package()
-{
-  cd "$srcdir/archboot"
-  mv etc/ usr/ "$pkgdir/"
-}

Copied: archboot/repos/extra-any/PKGBUILD (from rev 444872, 
archboot/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:34:20 UTC (rev 444873)
@@ -0,0 +1,55 @@
+# Maintainer : Tobias Powalowski 
+
+pkgname=archboot
+pkgver=2022.05
+pkgrel=35
+pkgdesc="Advanced, modular arch boot/install image creation utility"
+arch=(any)
+license=('GPL')
+url="https://wiki.archlinux.org/title/Archboot";
+depends=('mkinitcpio' 'pacman' 'wget' 'bash' 'coreutils' 'cryptsetup' 'dialog' 
'e2fsprogs' 'findutils' 'gawk' 'grep' 'iputils' 'jfsutils'
+ 'less' 'lvm2' 'mdadm' 'kmod' 'nano' 'ncurses' 'net-

[arch-commits] Commit in archboot/trunk (PKGBUILD)

2022-05-08 Thread Tobias Powalowski via arch-commits
Date: Sunday, May 8, 2022 @ 19:34:13
  Author: tpowa
Revision: 444872

upgpkg: archboot 2022.05-35: bump to latest version

Modified:
  archboot/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:26:57 UTC (rev 444871)
+++ PKGBUILD2022-05-08 19:34:13 UTC (rev 444872)
@@ -2,7 +2,7 @@
 
 pkgname=archboot
 pkgver=2022.05
-pkgrel=34
+pkgrel=35
 pkgdesc="Advanced, modular arch boot/install image creation utility"
 arch=(any)
 license=('GPL')



[arch-commits] Commit in staticcheck/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:32:58
  Author: foxboron
Revision: 1196276

archrelease: copy trunk to community-x86_64

Added:
  staticcheck/repos/community-x86_64/PKGBUILD
(from rev 1196275, staticcheck/trunk/PKGBUILD)
Deleted:
  staticcheck/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   80 ++---
 1 file changed, 40 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:32:53 UTC (rev 1196275)
+++ PKGBUILD2022-05-08 19:32:58 UTC (rev 1196276)
@@ -1,40 +0,0 @@
-# Maintainer: Morten Linderud 
-
-pkgname=staticcheck
-pkgver=2022.1.1
-pkgrel=1
-pkgdesc="The advanced Go linter"
-arch=('x86_64')
-url="https://staticcheck.io";
-license=("MIT")
-depends=('glibc')
-makedepends=('go' 'git')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/dominikh/go-tools/archive/$pkgver.tar.gz";)
-sha256sums=('988756d12527bf9843459a30cc6fbbf2a7d6d75e62326b0387eab6273e992543')
-
-prepare(){
-   cd "go-tools-$pkgver"
-   mkdir -p bin
-}
-
-build(){
-   cd "go-tools-$pkgver"
-   export CGO_LDFLAGS="${LDFLAGS}"
-   export CGO_CFLAGS="${CFLAGS}"
-   export CGO_CPPFLAGS="${CPPFLAGS}"
-   export CGO_CXXFLAGS="${CXXFLAGS}"
-   export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external"
-   go build -o bin/staticcheck ./cmd/staticcheck
-}
-
-check(){
-   cd "go-tools-$pkgver"
-   GOROOT="/usr/lib/go" go test -v ./...
-}
-
-package(){
-   cd "go-tools-$pkgver"
-   install -p -Dm755 bin/staticcheck "${pkgdir}/usr/bin/staticcheck"
-   install -Dm644 "LICENSE"  
"${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-   install -Dm644 "LICENSE-THIRD-PARTY"  
"${pkgdir}/usr/share/licenses/${pkgname}/LICENCE-THIRD-PARTY"
-}

Copied: staticcheck/repos/community-x86_64/PKGBUILD (from rev 1196275, 
staticcheck/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:32:58 UTC (rev 1196276)
@@ -0,0 +1,40 @@
+# Maintainer: Morten Linderud 
+
+pkgname=staticcheck
+pkgver=2022.1.1
+pkgrel=2
+pkgdesc="The advanced Go linter"
+arch=('x86_64')
+url="https://staticcheck.io";
+license=("MIT")
+depends=('glibc')
+makedepends=('go' 'git')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/dominikh/go-tools/archive/$pkgver.tar.gz";)
+sha256sums=('988756d12527bf9843459a30cc6fbbf2a7d6d75e62326b0387eab6273e992543')
+
+prepare(){
+   cd "go-tools-$pkgver"
+   mkdir -p bin
+}
+
+build(){
+   cd "go-tools-$pkgver"
+   export CGO_LDFLAGS="${LDFLAGS}"
+   export CGO_CFLAGS="${CFLAGS}"
+   export CGO_CPPFLAGS="${CPPFLAGS}"
+   export CGO_CXXFLAGS="${CXXFLAGS}"
+   export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external"
+   go build -o bin/staticcheck ./cmd/staticcheck
+}
+
+check(){
+   cd "go-tools-$pkgver"
+   GOROOT="/usr/lib/go" go test -v ./...
+}
+
+package(){
+   cd "go-tools-$pkgver"
+   install -p -Dm755 bin/staticcheck "${pkgdir}/usr/bin/staticcheck"
+   install -Dm644 "LICENSE"  
"${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+   install -Dm644 "LICENSE-THIRD-PARTY"  
"${pkgdir}/usr/share/licenses/${pkgname}/LICENCE-THIRD-PARTY"
+}



[arch-commits] Commit in staticcheck/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:32:53
  Author: foxboron
Revision: 1196275

upgpkg: staticcheck 2022.1.1-2: upgpkg: staticcheck 2022.1.1-2 - go 1.18 rebuild

Modified:
  staticcheck/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:31:27 UTC (rev 1196274)
+++ PKGBUILD2022-05-08 19:32:53 UTC (rev 1196275)
@@ -2,7 +2,7 @@
 
 pkgname=staticcheck
 pkgver=2022.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The advanced Go linter"
 arch=('x86_64')
 url="https://staticcheck.io";



[arch-commits] Commit in step-ca/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:31:27
  Author: foxboron
Revision: 1196274

archrelease: copy trunk to community-x86_64

Added:
  step-ca/repos/community-x86_64/PKGBUILD
(from rev 1196273, step-ca/trunk/PKGBUILD)
Deleted:
  step-ca/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   76 ++---
 1 file changed, 38 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:31:22 UTC (rev 1196273)
+++ PKGBUILD2022-05-08 19:31:27 UTC (rev 1196274)
@@ -1,38 +0,0 @@
-# Maintainer: Morten Linderud 
-
-pkgname=step-ca
-pkgver=0.19.0
-pkgrel=1
-pkgdesc="A private certificate authority (X.509 & SSH) & ACME server for 
secure automated certificate management, so you can use TLS everywhere & SSO 
for SSH."
-url="https://github.com/smallstep/certificates";
-arch=(x86_64)
-license=(Apache)
-depends=(glibc pcsclite)
-makedepends=(go)
-source=("$url/releases/download/v${pkgver}/step-ca_${pkgver}.tar.gz")
-sha512sums=('b118db5b45a9296fc86bdcdf3c8768a5de71a7ce6dade941754d393869e5a828c54dc279f2cb0c35864b56fa726abb29a54179850bb5f4ea795f51d0986a034f')
-
-prepare(){
-  mkdir -p bin
-}
-
-build() {
-  BUILD_DATE="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" '+%Y-%m-%d 
%H:%M UTC')"
-  go build \
-  -trimpath \
-  -buildmode=pie \
-  -mod=readonly \
-  -modcacherw \
-  -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -X 
\"main.Version=${pkgver}\" -X \"main.BuildTime=${BUILD_DATE}\"" \
-  -o bin ./cmd/...
-}
-
-check() {
-  go test -v ./...
-}
-
-package() {
-  for bin in step-awskms-init  step-ca  step-cloudkms-init  step-yubikey-init; 
do
-install -Dm755 "bin/$bin" "$pkgdir/usr/bin/$bin"
-  done
-}

Copied: step-ca/repos/community-x86_64/PKGBUILD (from rev 1196273, 
step-ca/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:31:27 UTC (rev 1196274)
@@ -0,0 +1,38 @@
+# Maintainer: Morten Linderud 
+
+pkgname=step-ca
+pkgver=0.19.0
+pkgrel=2
+pkgdesc="A private certificate authority (X.509 & SSH) & ACME server for 
secure automated certificate management, so you can use TLS everywhere & SSO 
for SSH."
+url="https://github.com/smallstep/certificates";
+arch=(x86_64)
+license=(Apache)
+depends=(glibc pcsclite)
+makedepends=(go)
+source=("$url/releases/download/v${pkgver}/step-ca_${pkgver}.tar.gz")
+sha512sums=('b118db5b45a9296fc86bdcdf3c8768a5de71a7ce6dade941754d393869e5a828c54dc279f2cb0c35864b56fa726abb29a54179850bb5f4ea795f51d0986a034f')
+
+prepare(){
+  mkdir -p bin
+}
+
+build() {
+  BUILD_DATE="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" '+%Y-%m-%d 
%H:%M UTC')"
+  go build \
+  -trimpath \
+  -buildmode=pie \
+  -mod=readonly \
+  -modcacherw \
+  -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -X 
\"main.Version=${pkgver}\" -X \"main.BuildTime=${BUILD_DATE}\"" \
+  -o bin ./cmd/...
+}
+
+check() {
+  go test -v ./...
+}
+
+package() {
+  for bin in step-awskms-init  step-ca  step-cloudkms-init  step-yubikey-init; 
do
+install -Dm755 "bin/$bin" "$pkgdir/usr/bin/$bin"
+  done
+}



[arch-commits] Commit in step-ca/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:31:22
  Author: foxboron
Revision: 1196273

upgpkg: step-ca 0.19.0-2: upgpkg: step-ca 0.19.0-2 - go 1.18 rebuild

Modified:
  step-ca/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:28:55 UTC (rev 1196272)
+++ PKGBUILD2022-05-08 19:31:22 UTC (rev 1196273)
@@ -2,7 +2,7 @@
 
 pkgname=step-ca
 pkgver=0.19.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A private certificate authority (X.509 & SSH) & ACME server for 
secure automated certificate management, so you can use TLS everywhere & SSO 
for SSH."
 url="https://github.com/smallstep/certificates";
 arch=(x86_64)



[arch-commits] Commit in toolbox/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:28:55
  Author: foxboron
Revision: 1196272

archrelease: copy trunk to community-x86_64

Added:
  toolbox/repos/community-x86_64/PKGBUILD
(from rev 1196271, toolbox/trunk/PKGBUILD)
Deleted:
  toolbox/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:28:47 UTC (rev 1196271)
+++ PKGBUILD2022-05-08 19:28:55 UTC (rev 1196272)
@@ -1,34 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski 
-# Maintainer: Morten Linderud 
-
-pkgname=toolbox
-pkgver=0.0.99.3
-pkgrel=1
-pkgdesc='Unprivileged development environment'
-arch=(x86_64)
-url='https://github.com/containers/toolbox'
-license=(APACHE)
-depends=(podman bash flatpak)
-makedepends=(go shellcheck go-md2man bash-completion ninja git meson)
-_commit=52c85b60d95ecb2c01cbd3901a16e7c43cd85440   #refs/tags/0.0.99.3^{}
-source=("git+$url#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd toolbox
-  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-build() {
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  arch-meson toolbox build -D profile_dir=/etc/profile.d
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}

Copied: toolbox/repos/community-x86_64/PKGBUILD (from rev 1196271, 
toolbox/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:28:55 UTC (rev 1196272)
@@ -0,0 +1,34 @@
+# Maintainer: Bartłomiej Piotrowski 
+# Maintainer: Morten Linderud 
+
+pkgname=toolbox
+pkgver=0.0.99.3
+pkgrel=2
+pkgdesc='Unprivileged development environment'
+arch=(x86_64)
+url='https://github.com/containers/toolbox'
+license=(APACHE)
+depends=(podman bash flatpak)
+makedepends=(go shellcheck go-md2man bash-completion ninja git meson)
+_commit=52c85b60d95ecb2c01cbd3901a16e7c43cd85440   #refs/tags/0.0.99.3^{}
+source=("git+$url#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd toolbox
+  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  arch-meson toolbox build -D profile_dir=/etc/profile.d
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}



[arch-commits] Commit in toolbox/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:28:47
  Author: foxboron
Revision: 1196271

upgpkg: toolbox 0.0.99.3-2: upgpkg: toolbox 0.0.99.3-2

Modified:
  toolbox/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:27:12 UTC (rev 1196270)
+++ PKGBUILD2022-05-08 19:28:47 UTC (rev 1196271)
@@ -3,7 +3,7 @@
 
 pkgname=toolbox
 pkgver=0.0.99.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Unprivileged development environment'
 arch=(x86_64)
 url='https://github.com/containers/toolbox'



[arch-commits] Commit in go-tools/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:27:12
  Author: foxboron
Revision: 1196270

archrelease: copy trunk to community-x86_64

Added:
  go-tools/repos/community-x86_64/PKGBUILD
(from rev 1196269, go-tools/trunk/PKGBUILD)
Deleted:
  go-tools/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |  102 ++---
 1 file changed, 51 insertions(+), 51 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:27:06 UTC (rev 1196269)
+++ PKGBUILD2022-05-08 19:27:12 UTC (rev 1196270)
@@ -1,51 +0,0 @@
-# Maintainer: Morten Linderud 
-# Contributor: Bartłomiej Piotrowski 
-
-pkgname=go-tools
-epoch=4
-pkgver=0.1.10
-pkgrel=1
-pkgdesc='Developer tools for the Go programming language'
-arch=(x86_64)
-url='https://golang.org/'
-license=(BSD)
-depends=(glibc)
-makedepends=(git go)
-_commit=c20fd7c261728ff8bc25aebb4d850b0880ab0530
-source=(go-tools::git+https://go.googlesource.com/tools#commit=$_commit)
-md5sums=('SKIP')
-
-_tools=(benchcmp callgraph compilebench cover digraph eg fiximports
-go-contrib-init godex godoc goimports gomvpkg gorename gotype 
-goyacc guru html2article present ssadump stringer toolstash)
-
-prepare() {
-cd go-tools
-mkdir -p bin/
-}
-
-build() {
-  cd go-tools
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external 
-mod=readonly -modcacherw"
-  go build -o bin/ ./cmd/...
-}
-
-check() {
-  cd go-tools
-  # Needs to be updated and godoc is failing the test suite
-  # See https://github.com/golang/go/issues/35690
-  go test ./cmd/...  || true
-}
-
-package() {
-  cd go-tools
-  for tool in ${_tools[@]}; do
-install -Dm755 bin/$tool "$pkgdir/usr/bin/$tool"
-  done
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: go-tools/repos/community-x86_64/PKGBUILD (from rev 1196269, 
go-tools/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:27:12 UTC (rev 1196270)
@@ -0,0 +1,51 @@
+# Maintainer: Morten Linderud 
+# Contributor: Bartłomiej Piotrowski 
+
+pkgname=go-tools
+epoch=4
+pkgver=0.1.10
+pkgrel=2
+pkgdesc='Developer tools for the Go programming language'
+arch=(x86_64)
+url='https://golang.org/'
+license=(BSD)
+depends=(glibc)
+makedepends=(git go)
+_commit=c20fd7c261728ff8bc25aebb4d850b0880ab0530
+source=(go-tools::git+https://go.googlesource.com/tools#commit=$_commit)
+md5sums=('SKIP')
+
+_tools=(benchcmp callgraph compilebench cover digraph eg fiximports
+go-contrib-init godex godoc goimports gomvpkg gorename gotype 
+goyacc guru html2article present ssadump stringer toolstash)
+
+prepare() {
+cd go-tools
+mkdir -p bin/
+}
+
+build() {
+  cd go-tools
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external 
-mod=readonly -modcacherw"
+  go build -o bin/ ./cmd/...
+}
+
+check() {
+  cd go-tools
+  # Needs to be updated and godoc is failing the test suite
+  # See https://github.com/golang/go/issues/35690
+  go test ./cmd/...  || true
+}
+
+package() {
+  cd go-tools
+  for tool in ${_tools[@]}; do
+install -Dm755 bin/$tool "$pkgdir/usr/bin/$tool"
+  done
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}



[arch-commits] Commit in go-tools/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 19:27:06
  Author: foxboron
Revision: 1196269

upgpkg: go-tools 4:0.1.10-2: upgpkg: go-tools 4:0.1.10-2

Modified:
  go-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:21:26 UTC (rev 1196268)
+++ PKGBUILD2022-05-08 19:27:06 UTC (rev 1196269)
@@ -4,7 +4,7 @@
 pkgname=go-tools
 epoch=4
 pkgver=0.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Developer tools for the Go programming language'
 arch=(x86_64)
 url='https://golang.org/'



[arch-commits] Commit in php7/repos (10 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:26:57
  Author: dvzrv
Revision: 444871

archrelease: copy trunk to staging-x86_64

Added:
  php7/repos/staging-x86_64/
  php7/repos/staging-x86_64/PKGBUILD
(from rev 444870, php7/trunk/PKGBUILD)
  php7/repos/staging-x86_64/apache.conf
(from rev 444870, php7/trunk/apache.conf)
  php7/repos/staging-x86_64/apache.patch
(from rev 444870, php7/trunk/apache.patch)
  php7/repos/staging-x86_64/enchant-2.patch
(from rev 444870, php7/trunk/enchant-2.patch)
  php7/repos/staging-x86_64/generate_patches
(from rev 444870, php7/trunk/generate_patches)
  php7/repos/staging-x86_64/php-fpm.patch
(from rev 444870, php7/trunk/php-fpm.patch)
  php7/repos/staging-x86_64/php-fpm.tmpfiles
(from rev 444870, php7/trunk/php-fpm.tmpfiles)
  php7/repos/staging-x86_64/php.ini.patch
(from rev 444870, php7/trunk/php.ini.patch)
  php7/repos/staging-x86_64/php7.patch
(from rev 444870, php7/trunk/php7.patch)

--+
 PKGBUILD |  352 +
 apache.conf  |   13 +
 apache.patch |   10 +
 enchant-2.patch  |   49 +++
 generate_patches |   68 ++
 php-fpm.patch|   76 +++
 php-fpm.tmpfiles |1 
 php.ini.patch|   77 +++
 php7.patch   |   11 +
 9 files changed, 657 insertions(+)

Copied: php7/repos/staging-x86_64/PKGBUILD (from rev 444870, 
php7/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2022-05-08 19:26:57 UTC (rev 444871)
@@ -0,0 +1,352 @@
+# Maintainer: Pierre Schmitz 
+# Contributor: Matt Harrison 
+
+pkgbase=php7
+pkgname=('php7'
+ 'php7-cgi'
+ 'php7-apache'
+ 'php7-fpm'
+ 'php7-embed'
+ 'php7-phpdbg'
+ 'php7-dblib'
+ 'php7-enchant'
+ 'php7-gd'
+ 'php7-imap'
+ 'php7-intl'
+ 'php7-sodium'
+ 'php7-odbc'
+ 'php7-pgsql'
+ 'php7-pspell'
+ 'php7-snmp'
+ 'php7-sqlite'
+ 'php7-tidy'
+ 'php7-xsl')
+pkgver=7.4.29
+pkgrel=4
+arch=('x86_64')
+license=('PHP')
+url='https://www.php.net/'
+makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 
'libsodium' 'libxslt' 'libzip' 'net-snmp'
+ 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 
'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
+ 'oniguruma')
+checkdepends=('procps-ng')
+options=(debug)
+source=("https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc}
+'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 
'php.ini.patch'
+'enchant-2.patch' 'php7.patch')
+sha512sums=('cdec93b3d10b80da4a16757e60ecf8b35e78adfc57edd40917f53c4d20ce2847363ac99954cc92492cd84b81c01c4af667b16c8f4fe54aa98b9181ef5b1951ba'
+'SKIP'
+
'284e3c0fe3ded0ff3e7d53f2769ea207b4591ef42abeff2d8604e87fe379929bd3b19ff294a729834f339a9da85ae7d4a7d8605890677222f78601b4f2b22247'
+
'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
+
'bf43a99b464a873986954233e2df4841eeab21a6d359a777b7514a4fa34462c9f0fd85243086122ed50c766d5b60fb83f9f181a9b43ae1b527672a4f3b8d8eed'
+
'7248e9a93faebb86b156130b6ecd8c9733ae8dfa2789c738f9db5a2ab2daee294132b7d8a5a59c860e9e235fdc1bc6a9e9b8b410a23ccc5c6627297d834d3120'
+
'642e9f84d9d0df96e5d9bafcd3aed7aab3b4374e7917be98e9fa386919c64e9a27ac2daace99b4fcaa7256cca60a87d22893c2ef5383e5353926d8869fda376d'
+
'5d7d44d692848fbb952e17e5bd6dffa79b764526e4940fbe0a5138ad62cb41abdb8c9bb8dd64cd1d0b488c74972bcf3f9c6d32a3bbeac90982fdf6321d3ec788'
+
'f8c197fb657958016340db87de3e3427cc692791e88c650362ed89bfd3be6180e430e5c446d19566b7e66225f9fa8cbed46a0909c87d6e046e65135d3031')
+validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312'
+  '42670A7FE4D0441C8E4632349E4FDC074A4EF02D')
+_interpreter=${pkgver%.*}
+
+prepare() {
+   cd "${srcdir}/php-${pkgver}"
+
+   patch -p0 -i "${srcdir}/apache.patch"
+   patch -p0 -i "${srcdir}/php-fpm.patch"
+   patch -p0 -i "${srcdir}/php.ini.patch"
+   patch -p0 -i "${srcdir}/enchant-2.patch"
+   patch -p0 -i "${srcdir}/php7.patch"
+   autoconf
+
+   rm tests/output/stream_isatty_*.phpt
+}
+
+build() {
+   # http://site.icu-project.org/download/61#TOC-Migration-Issues
+   CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
+   local _phpconfig="--srcdir=../php-${pkgver} \
+   --config-cache \
+   --prefix=/usr \
+   --sbindir=/usr/bin \
+   --sysconfdir=/etc/php7 \
+   --localstatedir=/var \
+   --with-layout=GNU \
+   --with-config-file-path=/etc/php7 \
+   --with-config-file-scan-dir=/etc/php7/conf.d \
+   --disable-rpath \
+   

[arch-commits] Commit in php7/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:24:47
  Author: dvzrv
Revision: 444870

upgpkg: php7 7.4.29-4: Rebuild to add php-interpreter virtual provides.

Add the virtual provides php-interpreter to php, which represents the major and
minor version of the php interpreter.
Remove virtual provides for other split packages as they are too complicated to 
deal with for now.

Modified:
  php7/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 2 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:24:00 UTC (rev 444869)
+++ PKGBUILD2022-05-08 19:24:47 UTC (rev 444870)
@@ -22,7 +22,7 @@
  'php7-tidy'
  'php7-xsl')
 pkgver=7.4.29
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 license=('PHP')
 url='https://www.php.net/'
@@ -193,7 +193,7 @@
 package_php7() {
pkgdesc='A general-purpose scripting language that is especially suited 
to web development'
depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma')
-   provides=(php=$pkgver)
+   provides=(php-interpreter=$_interpreter)
backup=('etc/php7/php.ini')
 
cd "${srcdir}/build"
@@ -212,7 +212,6 @@
 package_php7-cgi() {
pkgdesc='CGI and FCGI SAPI for PHP'
depends=('php7')
-   provides=(php-cgi=$pkgver php-cgi-interpreter=$_interpreter)
 
cd "${srcdir}/build"
make -j1 INSTALL_ROOT="${pkgdir}" install-cgi
@@ -221,7 +220,6 @@
 package_php7-apache() {
pkgdesc='Apache SAPI for PHP'
depends=('php7' 'apache' 'libnsl')
-   provides=(php-apache=$pkgver php-apache-interpreter=$_interpreter)
backup=('etc/httpd/conf/extra/php7_module.conf')
 
install -D -m755 "${srcdir}/build-apache/libs/libphp7.so" 
"${pkgdir}/usr/lib/httpd/modules/libphp7.so"
@@ -231,7 +229,6 @@
 package_php7-fpm() {
pkgdesc='FastCGI Process Manager for PHP'
depends=('php7' 'systemd')
-   provides=(php-fpm=$pkgver php-fpm-interpreter=$_interpreter)
backup=('etc/php7/php-fpm.conf' 'etc/php7/php-fpm.d/www.conf')
options=('!emptydirs')
 
@@ -244,7 +241,6 @@
 package_php7-embed() {
pkgdesc='Embedded PHP SAPI library'
depends=('php7' 'systemd-libs' 'libnsl' 'libxcrypt')
-   provides=(php-embed=$pkgver php-embed-interpreter=$_interpreter)
options=('!emptydirs')
 
cd "${srcdir}/build"
@@ -254,7 +250,6 @@
 package_php7-phpdbg() {
pkgdesc='Interactive PHP debugger'
depends=('php7')
-   provides=(php-phpdbg=$pkgver php-phpdbg-interpreter=$_interpreter)
options=('!emptydirs')
 
cd "${srcdir}/build-phpdbg"
@@ -264,7 +259,6 @@
 package_php7-dblib() {
pkgdesc='dblib module for PHP'
depends=('php7' 'freetds')
-   provides=(php-dblib=$pkgver php-dblib-interpreter=$_interpreter)
 
install -D -m755 "${srcdir}/build/modules/pdo_dblib.so" 
"${pkgdir}/usr/lib/php7/modules/pdo_dblib.so"
 }
@@ -272,7 +266,6 @@
 package_php7-enchant() {
pkgdesc='enchant module for PHP'
depends=('php7' 'enchant')
-   provides=(php-enchant=$pkgver php-enchant-interpreter=$_interpreter)
 
install -D -m755 "${srcdir}/build/modules/enchant.so" 
"${pkgdir}/usr/lib/php7/modules/enchant.so"
 }
@@ -280,7 +273,6 @@
 package_php7-gd() {
pkgdesc='gd module for PHP'
depends=('php7' 'gd')
-   provides=(php-gd=$pkgver php-gd-interpreter=$_interpreter)
 
install -D -m755 "${srcdir}/build/modules/gd.so" 
"${pkgdir}/usr/lib/php7/modules/gd.so"
 }
@@ -288,7 +280,6 @@
 package_php7-imap() {
pkgdesc='imap module for PHP'
depends=('php7' 'c-client' 'libxcrypt')
-   provides=(php-imap=$pkgver php-imap-interpreter=$_interpreter)
 
install -D -m755 "${srcdir}/build/modules/imap.so" 
"${pkgdir}/usr/lib/php7/modules/imap.so"
 }
@@ -296,7 +287,6 @@
 package_php7-intl() {
pkgdesc='intl module for PHP'
depends=('php7' 'icu')
-   provides=(php-intl=$pkgver php-intl-interpreter=$_interpreter)
 
install -D -m755 "${srcdir}/build/modules/intl.so" 
"${pkgdir}/usr/lib/php7/modules/intl.so"
 }
@@ -304,7 +294,6 @@
 package_php7-sodium() {
pkgdesc='sodium module for PHP'
depends=('php7' 'libsodium')
-   provides=(php-sodium=$pkgver php-sodium-interpreter=$_interpreter)
 
 
install -D -m755 "${srcdir}/build/modules/sodium.so" 
"${pkgdir}/usr/lib/php7/modules/sodium.so"
@@ -313,7 +302,6 @@
 package_php7-odbc() {
pkgdesc='ODBC modules for PHP'
depends=('php7' 'unixodbc')
-   provides=(php-odbc=$pkgver php-odbc-interpreter=$_interpreter)
 
install -D -m755 "${srcdir}/build/modules/odbc.so" 
"${pkgdir}/usr/lib/php7/modules/odbc.so"
install -D -m755 "${srcdir}/build/modules/pdo_odbc.so" 
"${pkgdir}/usr/lib/php7/modules/pdo_odbc.so"
@@ -322,7 +310,6 @@
 package_php7-pgsql() {
pkgdesc='PostgreSQL modules for PHP'
depends=('php7

[arch-commits] Commit in php/repos (8 files)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:24:00
  Author: dvzrv
Revision: 444869

archrelease: copy trunk to staging-x86_64

Added:
  php/repos/staging-x86_64/
  php/repos/staging-x86_64/PKGBUILD
(from rev 444868, php/trunk/PKGBUILD)
  php/repos/staging-x86_64/apache.conf
(from rev 444868, php/trunk/apache.conf)
  php/repos/staging-x86_64/apache.patch
(from rev 444868, php/trunk/apache.patch)
  php/repos/staging-x86_64/generate_patches
(from rev 444868, php/trunk/generate_patches)
  php/repos/staging-x86_64/php-fpm.patch
(from rev 444868, php/trunk/php-fpm.patch)
  php/repos/staging-x86_64/php-fpm.tmpfiles
(from rev 444868, php/trunk/php-fpm.tmpfiles)
  php/repos/staging-x86_64/php.ini.patch
(from rev 444868, php/trunk/php.ini.patch)

--+
 PKGBUILD |  340 +
 apache.conf  |   13 ++
 apache.patch |   10 +
 generate_patches |  103 
 php-fpm.patch|   74 +++
 php-fpm.tmpfiles |1 
 php.ini.patch|   78 
 7 files changed, 619 insertions(+)

Copied: php/repos/staging-x86_64/PKGBUILD (from rev 444868, php/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2022-05-08 19:24:00 UTC (rev 444869)
@@ -0,0 +1,340 @@
+# Maintainer: Pierre Schmitz 
+
+pkgbase=php
+pkgname=('php'
+ 'php-cgi'
+ 'php-apache'
+ 'php-fpm'
+ 'php-embed'
+ 'php-phpdbg'
+ 'php-dblib'
+ 'php-enchant'
+ 'php-gd'
+ 'php-imap'
+ 'php-intl'
+ 'php-sodium'
+ 'php-odbc'
+ 'php-pgsql'
+ 'php-pspell'
+ 'php-snmp'
+ 'php-sqlite'
+ 'php-tidy'
+ 'php-xsl')
+pkgver=8.1.5
+pkgrel=3
+arch=('x86_64')
+license=('PHP')
+url='https://www.php.net/'
+makedepends=('apache' 'aspell' 'c-client' 'db' 'gdbm' 'enchant' 'gd' 'gmp' 
'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
+ 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 
'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
+ 'oniguruma')
+checkdepends=('procps-ng')
+options=(debug)
+source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
+'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 
'php.ini.patch')
+sha256sums=('7647734b4dcecd56b7e4bd0bc55e54322fa3518299abcdc68eb557a7464a2e8a'
+'SKIP'
+'702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca'
+'4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e'
+'aa55fa4fc5c2b2493065bbd00cfe3c97a1b22b3dc7d34f8fd303de18cafe844f'
+'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
+'b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2')
+validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD'
+  '39B641343D8C104B2B146DC3F9C39DC0B9698544')
+_interpreter=${pkgver%.*}
+
+prepare() {
+   cd "${srcdir}/${pkgbase}-${pkgver}"
+
+   patch -p0 -i "${srcdir}/apache.patch"
+   patch -p0 -i "${srcdir}/php-fpm.patch"
+   patch -p0 -i "${srcdir}/php.ini.patch"
+   autoconf
+
+   # Disable failing tests
+   rm tests/output/stream_isatty_*.phpt
+   rm Zend/tests/arginfo_zpp_mismatch*.phpt
+}
+
+build() {
+   local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+   --config-cache \
+   --prefix=/usr \
+   --sbindir=/usr/bin \
+   --sysconfdir=/etc/php \
+   --localstatedir=/var \
+   --with-layout=GNU \
+   --with-config-file-path=/etc/php \
+   --with-config-file-scan-dir=/etc/php/conf.d \
+   --disable-rpath \
+   --mandir=/usr/share/man \
+   --disable-gcc-global-regs \
+   "
+
+   local _phpextensions="\
+   --enable-bcmath=shared \
+   --enable-calendar=shared \
+   --enable-dba=shared \
+   --enable-exif=shared \
+   --enable-ftp=shared \
+   --enable-gd=shared \
+   --enable-intl=shared \
+   --enable-mbstring \
+   --enable-pcntl \
+   --enable-shmop=shared \
+   --enable-soap=shared \
+   --enable-sockets=shared \
+   --enable-sysvmsg=shared \
+   --enable-sysvsem=shared \
+   --enable-sysvshm=shared \
+   --with-bz2=shared \
+   --with-curl=shared \
+   --with-db4=/usr \
+   --with-enchant=shared \
+   --with-external-gd \
+   --with-external-pcre \
+   --with-ffi=shared \
+   --with-gdbm \
+   --with-gettext=shared \
+   --with-gmp=shared \
+   --with-iconv=shared \
+ 

[arch-commits] Commit in php/trunk (PKGBUILD)

2022-05-08 Thread David Runge via arch-commits
Date: Sunday, May 8, 2022 @ 19:22:46
  Author: dvzrv
Revision: 444868

upgpkg: php 8.1.5-3: Rebuild to add php-interpreter virtual provides.

Add the virtual provides php-interpreter to php, which represents the major and
minor version of the php interpreter.

Modified:
  php/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 18:50:04 UTC (rev 444867)
+++ PKGBUILD2022-05-08 19:22:46 UTC (rev 444868)
@@ -21,7 +21,7 @@
  'php-tidy'
  'php-xsl')
 pkgver=8.1.5
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('PHP')
 url='https://www.php.net/'
@@ -29,6 +29,7 @@
  'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 
'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
  'oniguruma')
 checkdepends=('procps-ng')
+options=(debug)
 source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 
'php.ini.patch')
 sha256sums=('7647734b4dcecd56b7e4bd0bc55e54322fa3518299abcdc68eb557a7464a2e8a'
@@ -40,6 +41,7 @@
 'b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2')
 validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD'
   '39B641343D8C104B2B146DC3F9C39DC0B9698544')
+_interpreter=${pkgver%.*}
 
 prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -180,7 +182,7 @@
depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma' 'db' 
'gdbm')
replaces=('php-ldap')
conflicts=('php-ldap')
-   provides=("php-ldap=${pkgver}")
+   provides=("php-interpreter=$_interpreter" "php-ldap=${pkgver}")
backup=('etc/php/php.ini')
 
cd "${srcdir}/build"



[arch-commits] Commit in python-rich/repos/community-any (PKGBUILD PKGBUILD)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 19:15:56
  Author: freswa
Revision: 1196267

archrelease: copy trunk to community-any

Added:
  python-rich/repos/community-any/PKGBUILD
(from rev 1196266, python-rich/trunk/PKGBUILD)
Deleted:
  python-rich/repos/community-any/PKGBUILD

--+
 PKGBUILD |   50 +-
 1 file changed, 25 insertions(+), 25 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:15:53 UTC (rev 1196266)
+++ PKGBUILD2022-05-08 19:15:56 UTC (rev 1196267)
@@ -1,25 +0,0 @@
-# Maintainer: Frederik Schwan 
-# Contributor: Hao Long 
-
-pkgname=python-rich
-pkgver=12.4.0
-pkgrel=1
-pkgdesc='Render rich text, tables, progress bars, syntax highlighting, 
markdown and more to the terminal'
-arch=(any)
-url='https://github.com/willmcgugan/rich'
-license=('MIT')
-depends=('python-colorama' 'python-pygments' 'python-typing_extensions' 
'python-commonmark')
-makedepends=('python-pip' 'python-poetry')
-source=("https://github.com/willmcgugan/rich/archive/v${pkgver}/rich-${pkgver}.tar.gz";)
-b2sums=('fe38abeec7f896053fc2f13259694dd90378db5318683243cf7b13add91c356992b9e4faa475aa282af70694b14e7c82e54c292bd3bcb4411d460dc831310b26')
-
-build() {
-  cd rich-${pkgver}
-  poetry build --format wheel
-}
-
-package() {
-  cd rich-${pkgver}
-  PIP_CONFIG_FILE=/dev/null pip install --isolated --root="${pkgdir}" 
--ignore-installed --no-deps dist/*.whl
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: python-rich/repos/community-any/PKGBUILD (from rev 1196266, 
python-rich/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:15:56 UTC (rev 1196267)
@@ -0,0 +1,25 @@
+# Maintainer: Frederik Schwan 
+# Contributor: Hao Long 
+
+pkgname=python-rich
+pkgver=12.4.1
+pkgrel=1
+pkgdesc='Render rich text, tables, progress bars, syntax highlighting, 
markdown and more to the terminal'
+arch=(any)
+url='https://github.com/willmcgugan/rich'
+license=('MIT')
+depends=('python-colorama' 'python-pygments' 'python-typing_extensions' 
'python-commonmark')
+makedepends=('python-pip' 'python-poetry')
+source=("https://github.com/willmcgugan/rich/archive/v${pkgver}/rich-${pkgver}.tar.gz";)
+b2sums=('7eb8424ca5e3a985e6d000ed2c74784dba104237a67315c59d3f3cdf71a7196621566b9f40f7ca0e9f74d6bcd1daae781ee2aef871f5fbf738d3209ae13dba4a')
+
+build() {
+  cd rich-${pkgver}
+  poetry build --format wheel
+}
+
+package() {
+  cd rich-${pkgver}
+  PIP_CONFIG_FILE=/dev/null pip install --isolated --root="${pkgdir}" 
--ignore-installed --no-deps dist/*.whl
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in python-rich/trunk (PKGBUILD)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 19:15:53
  Author: freswa
Revision: 1196266

upgpkg: python-rich 12.4.1-1

Modified:
  python-rich/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:10:21 UTC (rev 1196265)
+++ PKGBUILD2022-05-08 19:15:53 UTC (rev 1196266)
@@ -2,7 +2,7 @@
 # Contributor: Hao Long 
 
 pkgname=python-rich
-pkgver=12.4.0
+pkgver=12.4.1
 pkgrel=1
 pkgdesc='Render rich text, tables, progress bars, syntax highlighting, 
markdown and more to the terminal'
 arch=(any)
@@ -11,7 +11,7 @@
 depends=('python-colorama' 'python-pygments' 'python-typing_extensions' 
'python-commonmark')
 makedepends=('python-pip' 'python-poetry')
 
source=("https://github.com/willmcgugan/rich/archive/v${pkgver}/rich-${pkgver}.tar.gz";)
-b2sums=('fe38abeec7f896053fc2f13259694dd90378db5318683243cf7b13add91c356992b9e4faa475aa282af70694b14e7c82e54c292bd3bcb4411d460dc831310b26')
+b2sums=('7eb8424ca5e3a985e6d000ed2c74784dba104237a67315c59d3f3cdf71a7196621566b9f40f7ca0e9f74d6bcd1daae781ee2aef871f5fbf738d3209ae13dba4a')
 
 build() {
   cd rich-${pkgver}



[arch-commits] Commit in streamlink/repos/community-any (PKGBUILD PKGBUILD)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 19:10:21
  Author: freswa
Revision: 1196265

archrelease: copy trunk to community-any

Added:
  streamlink/repos/community-any/PKGBUILD
(from rev 1196264, streamlink/trunk/PKGBUILD)
Deleted:
  streamlink/repos/community-any/PKGBUILD

--+
 PKGBUILD |   73 ++---
 1 file changed, 37 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 19:10:19 UTC (rev 1196264)
+++ PKGBUILD2022-05-08 19:10:21 UTC (rev 1196265)
@@ -1,36 +0,0 @@
-# Maintainer: Giancarlo Razzolini 
-# Contributor: Josip Ponjavic 
-
-pkgname=streamlink
-pkgver=3.1.1
-pkgrel=1
-pkgdesc='CLI program that launches streams from various streaming services in 
a custom video player (livestreamer fork)'
-arch=('any')
-url='https://streamlink.github.io/'
-license=('BSD')
-depends=("python-"{pycryptodome,isodate,pycountry,requests,pysocks,websocket-client})
-checkdepends=("python-"{freezegun,pytest,requests-mock})
-makedepends=("python-setuptools")
-optdepends=('ffmpeg: Required to play streams that are made up of separate 
audio and video streams, eg. YouTube 1080p+')
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
-validpgpkeys=('E2B794C7C2C37162E5E2A097E3DB9E282E390FA0') # Streamlink Signing 
Key 
-sha256sums=('855cd31e900e3ae1d5328a37123bfffe2aec501a1d74bcdd12f0d2a2758060e4'
-'SKIP')
-sha512sums=('6701991a55fed51838abebb72ccc6be0e7085f9b4d321be1411c3161df34549f060ab4676d815e836239486be22c93c836d806f21482738f6d7e645b052ffe27'
-'SKIP')
-
-build() {
-  cd "$pkgname-$pkgver"
-  python setup.py build
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  TZ=UTC PYTHONPATH="$PWD/build/lib:$PYTHONPATH" python -m pytest
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: streamlink/repos/community-any/PKGBUILD (from rev 1196264, 
streamlink/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 19:10:21 UTC (rev 1196265)
@@ -0,0 +1,37 @@
+# Maintainer: Giancarlo Razzolini 
+# Maintainer: Frederik Schwan 
+# Contributor: Josip Ponjavic 
+
+pkgname=streamlink
+pkgver=4.0.1
+pkgrel=1
+pkgdesc='CLI program that launches streams from various streaming services in 
a custom video player (livestreamer fork)'
+arch=('any')
+url='https://streamlink.github.io/'
+license=('BSD')
+depends=("python-"{pycryptodome,isodate,pycountry,requests,pysocks,websocket-client})
+checkdepends=("python-"{freezegun,pytest,requests-mock})
+makedepends=("python-"{build,installer,setuptools,versioningit,wheel})
+optdepends=('ffmpeg: Required to play streams that are made up of separate 
audio and video streams, eg. YouTube 1080p+')
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+validpgpkeys=('E2B794C7C2C37162E5E2A097E3DB9E282E390FA0') # Streamlink Signing 
Key 
+sha256sums=('f38a4fd5c45b1628e7ebee43ba7f8522be5045565aa7c64009740baf853f20f5'
+'SKIP')
+sha512sums=('f4a40e5f2cf6e564c1baebcafab64a6fd6345dcb1ff626a4ad3fa123a5227f0774347d22260b5e672b6e225c2924c8f50b20abdbf072e560da1bc6626fc4d62b'
+'SKIP')
+
+build() {
+  cd "$pkgname-$pkgver"
+  python -m build --wheel --no-isolation
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  TZ=UTC PYTHONPATH="$PWD/build/lib:$PYTHONPATH" python -m pytest
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}



[arch-commits] Commit in streamlink/trunk (PKGBUILD)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 19:10:19
  Author: freswa
Revision: 1196264

upgpkg: streamlink 4.0.1-1

Modified:
  streamlink/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 19:07:48 UTC (rev 1196263)
+++ PKGBUILD2022-05-08 19:10:19 UTC (rev 1196264)
@@ -1,8 +1,9 @@
 # Maintainer: Giancarlo Razzolini 
+# Maintainer: Frederik Schwan 
 # Contributor: Josip Ponjavic 
 
 pkgname=streamlink
-pkgver=3.1.1
+pkgver=4.0.1
 pkgrel=1
 pkgdesc='CLI program that launches streams from various streaming services in 
a custom video player (livestreamer fork)'
 arch=('any')
@@ -10,18 +11,18 @@
 license=('BSD')
 
depends=("python-"{pycryptodome,isodate,pycountry,requests,pysocks,websocket-client})
 checkdepends=("python-"{freezegun,pytest,requests-mock})
-makedepends=("python-setuptools")
+makedepends=("python-"{build,installer,setuptools,versioningit,wheel})
 optdepends=('ffmpeg: Required to play streams that are made up of separate 
audio and video streams, eg. YouTube 1080p+')
 
source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
 validpgpkeys=('E2B794C7C2C37162E5E2A097E3DB9E282E390FA0') # Streamlink Signing 
Key 
-sha256sums=('855cd31e900e3ae1d5328a37123bfffe2aec501a1d74bcdd12f0d2a2758060e4'
+sha256sums=('f38a4fd5c45b1628e7ebee43ba7f8522be5045565aa7c64009740baf853f20f5'
 'SKIP')
-sha512sums=('6701991a55fed51838abebb72ccc6be0e7085f9b4d321be1411c3161df34549f060ab4676d815e836239486be22c93c836d806f21482738f6d7e645b052ffe27'
+sha512sums=('f4a40e5f2cf6e564c1baebcafab64a6fd6345dcb1ff626a4ad3fa123a5227f0774347d22260b5e672b6e225c2924c8f50b20abdbf072e560da1bc6626fc4d62b'
 'SKIP')
 
 build() {
   cd "$pkgname-$pkgver"
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 check() {
@@ -31,6 +32,6 @@
 
 package() {
   cd "$pkgname-$pkgver"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }



[arch-commits] Commit in python-versioningit/repos (2 files)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 19:07:48
  Author: freswa
Revision: 1196263

archrelease: copy trunk to community-any

Added:
  python-versioningit/repos/community-any/
  python-versioningit/repos/community-any/PKGBUILD
(from rev 1196262, python-versioningit/trunk/PKGBUILD)

--+
 PKGBUILD |   32 
 1 file changed, 32 insertions(+)

Copied: python-versioningit/repos/community-any/PKGBUILD (from rev 1196262, 
python-versioningit/trunk/PKGBUILD)
===
--- community-any/PKGBUILD  (rev 0)
+++ community-any/PKGBUILD  2022-05-08 19:07:48 UTC (rev 1196263)
@@ -0,0 +1,32 @@
+# Maintainer: Frederik Schwan 
+# Contributor: Josip Ponjavic 
+# Contributor:
+
+pkgname=python-versioningit
+pkgver=1.1.1
+pkgrel=2
+pkgdesc='Versioning It with your Version In Git'
+arch=('any')
+url='https://github.com/jwodder/versioningit'
+license=('MIT')
+depends=('python-packaging' 'python-tomli')
+makedepends=('python-setuptools' 'python-build' 'python-installer' 
'python-wheel')
+checkdepends=('git' 'mercurial' 'python-pytest' 'python-tox')
+source=("${pkgname#*n-}-${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/${pkgname#*n-}-${pkgver}.tar.gz")
+sha256sums=('3b7565a2db92f1206b5b833a72cc6936c8a74d65e94224f0a9eb54799d1561d9')
+
+build() {
+  cd ${pkgname#*n-}-${pkgver}
+  python -m build --wheel --no-isolation
+}
+
+check() {
+  cd ${pkgname#*n-}-${pkgver}
+  tox -e py310
+}
+
+package() {
+  cd ${pkgname#*n-}-${pkgver}
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in (4 files)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 19:05:43
  Author: freswa
Revision: 1196262

move python-versioningit from unsupported to community

Added:
  python-versioningit/
  python-versioningit/repos/
  python-versioningit/trunk/
  python-versioningit/trunk/PKGBUILD

--+
 PKGBUILD |   32 
 1 file changed, 32 insertions(+)

Added: python-versioningit/trunk/PKGBUILD
===
--- python-versioningit/trunk/PKGBUILD  (rev 0)
+++ python-versioningit/trunk/PKGBUILD  2022-05-08 19:05:43 UTC (rev 1196262)
@@ -0,0 +1,32 @@
+# Maintainer: Frederik Schwan 
+# Contributor: Josip Ponjavic 
+# Contributor:
+
+pkgname=python-versioningit
+pkgver=1.1.1
+pkgrel=2
+pkgdesc='Versioning It with your Version In Git'
+arch=('any')
+url='https://github.com/jwodder/versioningit'
+license=('MIT')
+depends=('python-packaging' 'python-tomli')
+makedepends=('python-setuptools' 'python-build' 'python-installer' 
'python-wheel')
+checkdepends=('git' 'mercurial' 'python-pytest' 'python-tox')
+source=("${pkgname#*n-}-${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/${pkgname#*n-}-${pkgver}.tar.gz")
+sha256sums=('3b7565a2db92f1206b5b833a72cc6936c8a74d65e94224f0a9eb54799d1561d9')
+
+build() {
+  cd ${pkgname#*n-}-${pkgver}
+  python -m build --wheel --no-isolation
+}
+
+check() {
+  cd ${pkgname#*n-}-${pkgver}
+  tox -e py310
+}
+
+package() {
+  cd ${pkgname#*n-}-${pkgver}
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in fuse3/repos (testing-x86_64 testing-x86_64/PKGBUILD)

2022-05-08 Thread Anatol Pomozov via arch-commits
Date: Sunday, May 8, 2022 @ 18:50:04
  Author: anatolik
Revision: 444867

archrelease: copy trunk to testing-x86_64

Added:
  fuse3/repos/testing-x86_64/
  fuse3/repos/testing-x86_64/PKGBUILD
(from rev 444866, fuse3/trunk/PKGBUILD)

--+
 PKGBUILD |   48 
 1 file changed, 48 insertions(+)

Copied: fuse3/repos/testing-x86_64/PKGBUILD (from rev 444866, 
fuse3/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2022-05-08 18:50:04 UTC (rev 444867)
@@ -0,0 +1,48 @@
+# Maintainer: Ronald van Haren 
+# Contributor: Tom Gundersen 
+# Contributor: Mark Rosenstand 
+
+pkgbase=fuse3
+pkgname=(fuse-common fuse3)
+pkgver=3.11.0
+pkgrel=1
+arch=('x86_64')
+url='https://github.com/libfuse/libfuse'
+license=('GPL2')
+makedepends=('pkg-config' 'meson' 'udev')
+options=(!emptydirs)
+source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz{,.asc})
+sha256sums=('8982c4c521daf3974dda8a5d55d575c988da13a571970f00aea149eb54fdf14c'
+'SKIP')
+validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath 

+
+build() {
+  cd fuse-$pkgver
+
+  rm -rf build
+  meson --prefix=/usr --sbindir=bin -D examples=false . build
+  cd build
+  ninja
+}
+
+package_fuse-common() {
+  pkgdesc="Common files for fuse2/3 packages"
+  backup=(etc/fuse.conf)
+
+  install -Dm644 fuse-${pkgver}/util/fuse.conf "${pkgdir}"/etc/fuse.conf
+}
+
+package_fuse3() {
+  pkgdesc="A library that makes it possible to implement a filesystem in a 
userspace program."
+  depends=('fuse-common' 'glibc')
+
+  cd fuse-$pkgver/build
+
+  DESTDIR="${pkgdir}" ninja install
+
+  rm -r "${pkgdir}"/etc/init.d
+  rm -r "${pkgdir}"/etc/fuse.conf
+
+  # static device nodes are handled by udev
+  rm -r "${pkgdir}"/dev
+}



[arch-commits] Commit in fuse3/trunk (PKGBUILD)

2022-05-08 Thread Anatol Pomozov via arch-commits
Date: Sunday, May 8, 2022 @ 18:49:41
  Author: anatolik
Revision: 444866

upgpkg: fuse3 3.11.0-1

Modified:
  fuse3/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 17:56:23 UTC (rev 444865)
+++ PKGBUILD2022-05-08 18:49:41 UTC (rev 444866)
@@ -4,7 +4,7 @@
 
 pkgbase=fuse3
 pkgname=(fuse-common fuse3)
-pkgver=3.10.5
+pkgver=3.11.0
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/libfuse/libfuse'
@@ -12,7 +12,7 @@
 makedepends=('pkg-config' 'meson' 'udev')
 options=(!emptydirs)
 
source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz{,.asc})
-sha256sums=('b2e283485d47404ac896dd0bb7f7ba81e1470838e677e45f659804c3a3b69666'
+sha256sums=('8982c4c521daf3974dda8a5d55d575c988da13a571970f00aea149eb54fdf14c'
 'SKIP')
 validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath 

 



[arch-commits] Commit in avrdude/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 13:32:42
  Author: freswa
Revision: 1196261

archrelease: copy trunk to community-x86_64

Added:
  avrdude/repos/community-x86_64/PKGBUILD
(from rev 1196260, avrdude/trunk/PKGBUILD)
Deleted:
  avrdude/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   64 ++---
 1 file changed, 32 insertions(+), 32 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 13:32:40 UTC (rev 1196260)
+++ PKGBUILD2022-05-08 13:32:42 UTC (rev 1196261)
@@ -1,32 +0,0 @@
-# Contributor: Corrado Primier 
-# Maintainer: Brad Fanella 
-
-pkgname=avrdude
-pkgver=6.4
-pkgrel=1
-epoch=1
-pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR 
microcontrollers"
-arch=('x86_64')
-url="https://www.nongnu.org/avrdude/";
-license=('GPL')
-depends=('readline' 'libftdi' 'libusb-compat' 'elfutils')
-source=(https://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
-validpgpkeys=('EF497ABE47ED91B3FC3D7EA54D902FF7723BDEE9' 
'5E84F980C3CAFD4BB5841070F48CA81B69A85873' 
'56628323218C669FF578705C7E9EADC3030D34EB')
-md5sums=('a19321b2563fd5ed60fbc1e687b020dc'
- 'SKIP')
-
-build() {
-   cd "${pkgname}-${pkgver}"
-
-   ./configure --mandir=/usr/share/man \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --enable-linuxgpio
-   make
-}
-
-package() {
-   cd "${pkgname}-${pkgver}"
-
-   make DESTDIR="${pkgdir}" install
-}

Copied: avrdude/repos/community-x86_64/PKGBUILD (from rev 1196260, 
avrdude/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 13:32:42 UTC (rev 1196261)
@@ -0,0 +1,32 @@
+# Contributor: Corrado Primier 
+# Maintainer: Brad Fanella 
+
+pkgname=avrdude
+pkgver=7.0
+pkgrel=1
+epoch=1
+pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR 
microcontrollers"
+arch=('x86_64')
+url="https://www.nongnu.org/avrdude/";
+license=('GPL')
+depends=('readline' 'libftdi' 'libusb-compat' 'elfutils')
+source=(https://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
+validpgpkeys=('EF497ABE47ED91B3FC3D7EA54D902FF7723BDEE9' 
'5E84F980C3CAFD4BB5841070F48CA81B69A85873' 
'56628323218C669FF578705C7E9EADC3030D34EB')
+md5sums=('7927cfbccfe2f016eaef1bdeff399e96'
+ 'SKIP')
+
+build() {
+   cd "${pkgname}-${pkgver}"
+
+   ./configure --mandir=/usr/share/man \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --enable-linuxgpio
+   make
+}
+
+package() {
+   cd "${pkgname}-${pkgver}"
+
+   make DESTDIR="${pkgdir}" install
+}



[arch-commits] Commit in avrdude/trunk (PKGBUILD)

2022-05-08 Thread Frederik Schwan via arch-commits
Date: Sunday, May 8, 2022 @ 13:32:40
  Author: freswa
Revision: 1196260

upgpkg: avrdude 1:7.0-1

Modified:
  avrdude/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 12:14:17 UTC (rev 1196259)
+++ PKGBUILD2022-05-08 13:32:40 UTC (rev 1196260)
@@ -2,7 +2,7 @@
 # Maintainer: Brad Fanella 
 
 pkgname=avrdude
-pkgver=6.4
+pkgver=7.0
 pkgrel=1
 epoch=1
 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR 
microcontrollers"
@@ -12,7 +12,7 @@
 depends=('readline' 'libftdi' 'libusb-compat' 'elfutils')
 
source=(https://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
 validpgpkeys=('EF497ABE47ED91B3FC3D7EA54D902FF7723BDEE9' 
'5E84F980C3CAFD4BB5841070F48CA81B69A85873' 
'56628323218C669FF578705C7E9EADC3030D34EB')
-md5sums=('a19321b2563fd5ed60fbc1e687b020dc'
+md5sums=('7927cfbccfe2f016eaef1bdeff399e96'
  'SKIP')
 
 build() {



[arch-commits] Commit in liblxqt/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:14:17
  Author: yan12125
Revision: 1196259

archrelease: copy trunk to community-x86_64

Added:
  liblxqt/repos/community-x86_64/PKGBUILD
(from rev 1196258, liblxqt/trunk/PKGBUILD)
Deleted:
  liblxqt/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   75 +++--
 1 file changed, 34 insertions(+), 41 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 12:14:04 UTC (rev 1196258)
+++ PKGBUILD2022-05-08 12:14:17 UTC (rev 1196259)
@@ -1,41 +0,0 @@
-# Maintainer: Jerome Leclanche 
-# Maintainer: Chih-Hsuan Yen 
-
-pkgname=liblxqt
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="Common base library for LXQt components"
-arch=("x86_64")
-url="https://github.com/lxqt/$pkgname";
-license=("LGPL2.1")
-depends=("kwindowsystem" "libxss" "polkit-qt5" "libQt5Xdg.so")
-makedepends=("lxqt-build-tools")
-source=(
-  
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
-  
"liblxqt-308.patch::https://github.com/lxqt/liblxqt/commit/ead8ceefa2a142b59e346b9df39a0070de709c73.patch";
-)
-sha256sums=('364db8bad17c0aad12c04cda15a7c74c80dec96b1ef4b1175aec9282c39b2cba'
-'SKIP'
-'5325a7c2903c4fd68043473483b8b43c889af0cc96b21253bd4bfae667213f38')
-validpgpkeys=(
-  "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

-  "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

-  "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

-)
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../liblxqt-308.patch
-}
-
-build() {
-  cmake -B build -S "$srcdir/$pkgname-$pkgver" \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=None
-  make -C build
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: liblxqt/repos/community-x86_64/PKGBUILD (from rev 1196258, 
liblxqt/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 12:14:17 UTC (rev 1196259)
@@ -0,0 +1,34 @@
+# Maintainer: Jerome Leclanche 
+# Maintainer: Chih-Hsuan Yen 
+
+pkgname=liblxqt
+pkgver=1.1.0
+pkgrel=3
+pkgdesc="Common base library for LXQt components"
+arch=("x86_64")
+url="https://github.com/lxqt/$pkgname";
+license=("LGPL2.1")
+depends=("kwindowsystem" "libxss" "polkit-qt5" "libQt5Xdg.so")
+makedepends=("lxqt-build-tools")
+source=(
+  
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
+)
+sha256sums=('364db8bad17c0aad12c04cda15a7c74c80dec96b1ef4b1175aec9282c39b2cba'
+'SKIP')
+validpgpkeys=(
+  "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

+  "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

+  "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

+)
+
+build() {
+  cmake -B build -S "$srcdir/$pkgname-$pkgver" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=None
+  make -C build
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}



[arch-commits] Commit in liblxqt/trunk (PKGBUILD)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:14:04
  Author: yan12125
Revision: 1196258

upgpkg: liblxqt 1.1.0-3; drop the reverted upstream commit

See: https://github.com/lxqt/liblxqt/pull/310

Modified:
  liblxqt/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 12:08:07 UTC (rev 1196257)
+++ PKGBUILD2022-05-08 12:14:04 UTC (rev 1196258)
@@ -3,7 +3,7 @@
 
 pkgname=liblxqt
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Common base library for LXQt components"
 arch=("x86_64")
 url="https://github.com/lxqt/$pkgname";
@@ -12,11 +12,9 @@
 makedepends=("lxqt-build-tools")
 source=(
   
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
-  
"liblxqt-308.patch::https://github.com/lxqt/liblxqt/commit/ead8ceefa2a142b59e346b9df39a0070de709c73.patch";
 )
 sha256sums=('364db8bad17c0aad12c04cda15a7c74c80dec96b1ef4b1175aec9282c39b2cba'
-'SKIP'
-'5325a7c2903c4fd68043473483b8b43c889af0cc96b21253bd4bfae667213f38')
+'SKIP')
 validpgpkeys=(
   "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

   "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

@@ -23,11 +21,6 @@
   "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

 )
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../liblxqt-308.patch
-}
-
 build() {
   cmake -B build -S "$srcdir/$pkgname-$pkgver" \
 -DCMAKE_INSTALL_PREFIX=/usr \



[arch-commits] Commit in lxqt-session/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:08:07
  Author: yan12125
Revision: 1196257

archrelease: copy trunk to community-x86_64

Added:
  lxqt-session/repos/community-x86_64/PKGBUILD
(from rev 1196256, lxqt-session/trunk/PKGBUILD)
Deleted:
  lxqt-session/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |   76 ++---
 1 file changed, 38 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 12:07:53 UTC (rev 1196256)
+++ PKGBUILD2022-05-08 12:08:07 UTC (rev 1196257)
@@ -1,38 +0,0 @@
-# Maintainer: Chih-Hsuan Yen 
-# Contributor: Jerome Leclanche 
-
-pkgname=lxqt-session
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="The LXQt session manager"
-arch=("x86_64")
-groups=("lxqt")
-url="https://github.com/lxqt/$pkgname";
-license=("LGPL2.1")
-depends=("liblxqt" "xdg-user-dirs"  "libx11" "udev" "kwindowsystem" 
"libQt5Xdg.so" "procps")
-makedepends=("cmake" "lxqt-build-tools")
-optdepends=(
-   "breeze-icons: Default icon theme"
-   "oxygen-icons: Alternative icon theme"
-   "sddm: The recommended display manager"
-)
-source=(
-   
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
-)
-sha256sums=('5ca98a17eec1b6e084860d92764a34e4e21286a37b90796f1c523c0d576fb117'
-'SKIP')
-validpgpkeys=(
-   "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

-   "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

-   "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

-)
-
-build() {
-   cmake -S "$srcdir/$pkgname-$pkgver" -B build \
-   -DCMAKE_INSTALL_PREFIX=/usr
-   cmake --build build
-}
-
-package() {
-   DESTDIR="$pkgdir" cmake --install build
-}

Copied: lxqt-session/repos/community-x86_64/PKGBUILD (from rev 1196256, 
lxqt-session/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 12:08:07 UTC (rev 1196257)
@@ -0,0 +1,38 @@
+# Maintainer: Chih-Hsuan Yen 
+# Contributor: Jerome Leclanche 
+
+pkgname=lxqt-session
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="The LXQt session manager"
+arch=("x86_64")
+groups=("lxqt")
+url="https://github.com/lxqt/$pkgname";
+license=("LGPL2.1")
+depends=("liblxqt" "qtxdg-tools" "xdg-user-dirs"  "libx11" "udev" 
"kwindowsystem" "libQt5Xdg.so" "procps")
+makedepends=("cmake" "lxqt-build-tools")
+optdepends=(
+   "breeze-icons: Default icon theme"
+   "oxygen-icons: Alternative icon theme"
+   "sddm: The recommended display manager"
+)
+source=(
+   
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
+)
+sha256sums=('dc763e73bf2bb7ba310e21c8dfb5f9229dcc24f048f711e5de808a759d2c1849'
+'SKIP')
+validpgpkeys=(
+   "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

+   "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

+   "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

+)
+
+build() {
+   cmake -S "$srcdir/$pkgname-$pkgver" -B build \
+   -DCMAKE_INSTALL_PREFIX=/usr
+   cmake --build build
+}
+
+package() {
+   DESTDIR="$pkgdir" cmake --install build
+}



[arch-commits] Commit in lxqt-session/trunk (PKGBUILD)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:07:53
  Author: yan12125
Revision: 1196256

upgpkg: lxqt-session 1.1.1-1

Modified:
  lxqt-session/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 12:05:05 UTC (rev 1196255)
+++ PKGBUILD2022-05-08 12:07:53 UTC (rev 1196256)
@@ -2,7 +2,7 @@
 # Contributor: Jerome Leclanche 
 
 pkgname=lxqt-session
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="The LXQt session manager"
 arch=("x86_64")
@@ -9,7 +9,7 @@
 groups=("lxqt")
 url="https://github.com/lxqt/$pkgname";
 license=("LGPL2.1")
-depends=("liblxqt" "xdg-user-dirs"  "libx11" "udev" "kwindowsystem" 
"libQt5Xdg.so" "procps")
+depends=("liblxqt" "qtxdg-tools" "xdg-user-dirs"  "libx11" "udev" 
"kwindowsystem" "libQt5Xdg.so" "procps")
 makedepends=("cmake" "lxqt-build-tools")
 optdepends=(
"breeze-icons: Default icon theme"
@@ -19,7 +19,7 @@
 source=(

"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
 )
-sha256sums=('5ca98a17eec1b6e084860d92764a34e4e21286a37b90796f1c523c0d576fb117'
+sha256sums=('dc763e73bf2bb7ba310e21c8dfb5f9229dcc24f048f711e5de808a759d2c1849'
 'SKIP')
 validpgpkeys=(
"169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 




[arch-commits] Commit in qtxdg-tools/repos (2 files)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:05:05
  Author: yan12125
Revision: 1196255

archrelease: copy trunk to community-x86_64

Added:
  qtxdg-tools/repos/community-x86_64/
  qtxdg-tools/repos/community-x86_64/PKGBUILD
(from rev 1196254, qtxdg-tools/trunk/PKGBUILD)

--+
 PKGBUILD |   29 +
 1 file changed, 29 insertions(+)

Copied: qtxdg-tools/repos/community-x86_64/PKGBUILD (from rev 1196254, 
qtxdg-tools/trunk/PKGBUILD)
===
--- community-x86_64/PKGBUILD   (rev 0)
+++ community-x86_64/PKGBUILD   2022-05-08 12:05:05 UTC (rev 1196255)
@@ -0,0 +1,29 @@
+# Maintainer: Chih-Hsuan Yen 
+
+pkgname=qtxdg-tools
+pkgver=3.9.1
+pkgrel=1
+pkgdesc="libqtxdg user tools"
+arch=("x86_64")
+url="https://github.com/lxqt/qtxdg-tools";
+license=("LGPL2.1")
+depends=("qt5-base" "libqtxdg")
+makedepends=("cmake" "qt5-tools" "lxqt-build-tools")
+source=("https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc})
+sha256sums=('99d9cb63075e4c7e0b9f09035394ab1dc6caef9d714dcc88022f9cddc82ec362'
+'SKIP')
+validpgpkeys=(
+  "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

+)
+conflicts=('libqtxdg<3.9.1')
+
+build() {
+  cmake -B build -S "$srcdir/$pkgname-$pkgver" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}



[arch-commits] Commit in libqtxdg/repos/community-x86_64 (4 files)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:04:36
  Author: yan12125
Revision: 1196254

archrelease: copy trunk to community-x86_64

Added:
  libqtxdg/repos/community-x86_64/PKGBUILD
(from rev 1196253, libqtxdg/trunk/PKGBUILD)
  libqtxdg/repos/community-x86_64/rebuild.list
(from rev 1196253, libqtxdg/trunk/rebuild.list)
Deleted:
  libqtxdg/repos/community-x86_64/PKGBUILD
  libqtxdg/repos/community-x86_64/rebuild.list

--+
 PKGBUILD |  102 -
 rebuild.list |2 -
 2 files changed, 52 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 12:04:17 UTC (rev 1196253)
+++ PKGBUILD2022-05-08 12:04:36 UTC (rev 1196254)
@@ -1,51 +0,0 @@
-# Maintainer: Jerome Leclanche 
-# Co-Maintainer: Chih-Hsuan Yen 
-
-pkgname=libqtxdg
-pkgver=3.9.0
-pkgrel=1
-pkgdesc="Library providing freedesktop.org XDG specs implementations for Qt"
-arch=("x86_64")
-url="https://github.com/lxqt/$pkgname";
-license=("LGPL" "custom")
-depends=("libsm" "libxkbcommon-x11" "qt5-base" "qt5-svg")
-makedepends=("cmake" "lxqt-build-tools")
-checkdepends=("xorg-server-xvfb")
-optdepends=(
-  'xterm: the default terminal for running .desktop files'
-)
-provides=("libQt5Xdg.so" "libQt5XdgIconLoader.so")
-source=(
-  
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz";
-  
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz.asc";
-)
-sha256sums=('b049a14e0b2c61001d8a9ee23f5801a3cd69ab1b2f2f705d6e1b1f5673a1b203'
-'SKIP')
-validpgpkeys=(
-  "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

-  "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

-  "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

-)
-
-
-build() {
-  mkdir -p build
-  cd build
-  cmake "$srcdir/$pkgname-$pkgver" \
--DCMAKE_INSTALL_PREFIX=/usr \
--DBUILD_TESTS=ON
-  make
-}
-
-check() {
-  cd build
-
-  xvfb-run --auto-display make test
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 
"$srcdir/$pkgname-$pkgver"/{AUTHORS,COPYING,Digia-Qt-LGPL-Exception-1.1} \
--t "$pkgdir"/usr/share/licenses/$pkgname
-}

Copied: libqtxdg/repos/community-x86_64/PKGBUILD (from rev 1196253, 
libqtxdg/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 12:04:36 UTC (rev 1196254)
@@ -0,0 +1,51 @@
+# Maintainer: Jerome Leclanche 
+# Co-Maintainer: Chih-Hsuan Yen 
+
+pkgname=libqtxdg
+pkgver=3.9.1
+pkgrel=1
+pkgdesc="Library providing freedesktop.org XDG specs implementations for Qt"
+arch=("x86_64")
+url="https://github.com/lxqt/$pkgname";
+license=("LGPL" "custom")
+depends=("libsm" "libxkbcommon-x11" "qt5-base" "qt5-svg")
+makedepends=("cmake" "lxqt-build-tools")
+checkdepends=("xorg-server-xvfb")
+optdepends=(
+  'xterm: the default terminal for running .desktop files'
+)
+provides=("libQt5Xdg.so" "libQt5XdgIconLoader.so")
+source=(
+  
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz";
+  
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz.asc";
+)
+sha256sums=('d1ed8db58227d6423263fc3ab3c1e8e7d6e47eac01ea09047651ce95ca8604ce'
+'SKIP')
+validpgpkeys=(
+  "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 

+  "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida 

+  "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

+)
+
+
+build() {
+  mkdir -p build
+  cd build
+  cmake "$srcdir/$pkgname-$pkgver" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_TESTS=ON
+  make
+}
+
+check() {
+  cd build
+
+  xvfb-run --auto-display make test
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 
"$srcdir/$pkgname-$pkgver"/{AUTHORS,COPYING,Digia-Qt-LGPL-Exception-1.1} \
+-t "$pkgdir"/usr/share/licenses/$pkgname
+}

Deleted: rebuild.list
===
--- rebuild.list2022-05-08 12:04:17 UTC (rev 1196253)
+++ rebuild.list2022-05-08 12:04:36 UTC (rev 1196254)
@@ -1 +0,0 @@
-deepin-qt5integration

Copied: libqtxdg/repos/community-x86_64/rebuild.list (from rev 1196253, 
libqtxdg/trunk/rebuild.list)
===
--- rebuild.list(rev 0)
+++ rebuild.list2022-05-08 12:04:36 UTC (rev 1196254)
@@ -0,0 +1 @@
+deepin-qt5integration



[arch-commits] Commit in libqtxdg/trunk (PKGBUILD)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:04:17
  Author: yan12125
Revision: 1196253

upgpkg: libqtxdg 3.9.1-1

Modified:
  libqtxdg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 12:04:03 UTC (rev 1196252)
+++ PKGBUILD2022-05-08 12:04:17 UTC (rev 1196253)
@@ -2,7 +2,7 @@
 # Co-Maintainer: Chih-Hsuan Yen 
 
 pkgname=libqtxdg
-pkgver=3.9.0
+pkgver=3.9.1
 pkgrel=1
 pkgdesc="Library providing freedesktop.org XDG specs implementations for Qt"
 arch=("x86_64")
@@ -19,7 +19,7 @@
   
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz";
   
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz.asc";
 )
-sha256sums=('b049a14e0b2c61001d8a9ee23f5801a3cd69ab1b2f2f705d6e1b1f5673a1b203'
+sha256sums=('d1ed8db58227d6423263fc3ab3c1e8e7d6e47eac01ea09047651ce95ca8604ce'
 'SKIP')
 validpgpkeys=(
   "169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche 




[arch-commits] Commit in (4 files)

2022-05-08 Thread Chih-Hsuan Yen via arch-commits
Date: Sunday, May 8, 2022 @ 12:04:03
  Author: yan12125
Revision: 1196252

qtxdg-tools: a new package, split out of libqtxdg

Added:
  qtxdg-tools/
  qtxdg-tools/repos/
  qtxdg-tools/trunk/
  qtxdg-tools/trunk/PKGBUILD

--+
 PKGBUILD |   29 +
 1 file changed, 29 insertions(+)

Added: qtxdg-tools/trunk/PKGBUILD
===
--- qtxdg-tools/trunk/PKGBUILD  (rev 0)
+++ qtxdg-tools/trunk/PKGBUILD  2022-05-08 12:04:03 UTC (rev 1196252)
@@ -0,0 +1,29 @@
+# Maintainer: Chih-Hsuan Yen 
+
+pkgname=qtxdg-tools
+pkgver=3.9.1
+pkgrel=1
+pkgdesc="libqtxdg user tools"
+arch=("x86_64")
+url="https://github.com/lxqt/qtxdg-tools";
+license=("LGPL2.1")
+depends=("qt5-base" "libqtxdg")
+makedepends=("cmake" "qt5-tools" "lxqt-build-tools")
+source=("https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc})
+sha256sums=('99d9cb63075e4c7e0b9f09035394ab1dc6caef9d714dcc88022f9cddc82ec362'
+'SKIP')
+validpgpkeys=(
+  "19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang 

+)
+conflicts=('libqtxdg<3.9.1')
+
+build() {
+  cmake -B build -S "$srcdir/$pkgname-$pkgver" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}



[arch-commits] Commit in xdp-tools/repos/community-x86_64 (PKGBUILD PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 12:02:50
  Author: foxboron
Revision: 1196251

archrelease: copy trunk to community-x86_64

Added:
  xdp-tools/repos/community-x86_64/PKGBUILD
(from rev 1196250, xdp-tools/trunk/PKGBUILD)
Deleted:
  xdp-tools/repos/community-x86_64/PKGBUILD

--+
 PKGBUILD |  116 +++--
 1 file changed, 60 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 12:02:43 UTC (rev 1196250)
+++ PKGBUILD2022-05-08 12:02:50 UTC (rev 1196251)
@@ -1,56 +0,0 @@
-# Maintainer: Morten Linderud 
-# Contributor:  Emanuel Schmidt 
-
-pkgbase=xdp-tools
-pkgname=(xdp-tools libxdp)
-pkgver=1.2.3
-pkgrel=7
-pkgdesc='Utilities and example programs for use with XDP'
-url='https://github.com/xdp-project/xdp-tools'
-license=('GPL' 'LGPL' 'BSD2')
-arch=('x86_64')
-depends=('libelf' 'linux-api-headers' 'libbpf' 'libpcap.so')
-makedepends=('clang' 'llvm' 'gcc' 'make' 'm4' 'pkgconfig' 'libpcap' 'zlib')
-options=(!lto debug)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/xdp-project/xdp-tools/archive/refs/tags/v${pkgver}.tar.gz";)
-sha512sums=('588cda7010592f34ac600993ea528b76be4a8786c1b4e4599c92c5683a80848a11ae90db825f56b67adec60bd8c684bb4ced21dc1bc1b750cbd5d0704d67390d')
-b2sums=('26c1bfd5b6c3457794801db64d020b8d6eb254661a0a44fa89dde6a1ff7c04dec1207d38a755029c8caaa955cabec70f196e37257f337cf484b8e3525261119e')
-
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  export PRODUCTION=1
-  export DYNAMIC_LIBXDP=1
-  export FORCE_SYSTEM_LIBBPF=1
-  export PREFIX="/usr"
-  ./configure
-  make V=1
-}
-
-package_xdp-tools() {
-  cd "${pkgname}-${pkgver}"
-  pkgdesc="Utilities and example programs for use with XDP"
-  depends=("libxdp")
-  export DESTDIR="${pkgdir}"
-  export SBINDIR="/usr/bin"
-  export PREFIX="/usr"
-  make install V=1
-
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 LICENSE LICENSES/* -t 
"${pkgdir}/usr/share/licenses/${pkgname}"
-  rm -rf "${pkgdir}"/usr/share/xdp-tools/*.sh \
- "${pkgdir}"/usr/share/xdp-tools/test* \
- "${pkgdir}"/usr/lib \
- "${pkgdir}"/usr/include \
- "${pkgdir}"/usr/share/man/man3
-}
-
-package_libxdp() {
-  cd "${pkgbase}-${pkgver}"
-  pkgdesc="The libxdp package contains the libxdp library for managing XDP 
programs"
-  provides=('libxdp.so')
-  export DESTDIR="${pkgdir}"
-  export SBINDIR="/usr/bin"
-  export PREFIX="/usr"
-  make libxdp_install V=1
-}

Copied: xdp-tools/repos/community-x86_64/PKGBUILD (from rev 1196250, 
xdp-tools/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 12:02:50 UTC (rev 1196251)
@@ -0,0 +1,60 @@
+# Maintainer: Morten Linderud 
+# Contributor:  Emanuel Schmidt 
+
+pkgbase=xdp-tools
+pkgname=(xdp-tools libxdp)
+pkgver=1.2.3
+pkgrel=8
+pkgdesc='Utilities and example programs for use with XDP'
+url='https://github.com/xdp-project/xdp-tools'
+license=('GPL' 'LGPL' 'BSD2')
+arch=('x86_64')
+depends=('libelf' 'linux-api-headers' 'libbpf' 'libpcap.so')
+makedepends=('clang' 'llvm' 'gcc' 'make' 'm4' 'pkgconfig' 'libpcap' 'zlib')
+options=(!lto debug)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/xdp-project/xdp-tools/archive/refs/tags/v${pkgver}.tar.gz";)
+sha512sums=('588cda7010592f34ac600993ea528b76be4a8786c1b4e4599c92c5683a80848a11ae90db825f56b67adec60bd8c684bb4ced21dc1bc1b750cbd5d0704d67390d')
+b2sums=('26c1bfd5b6c3457794801db64d020b8d6eb254661a0a44fa89dde6a1ff7c04dec1207d38a755029c8caaa955cabec70f196e37257f337cf484b8e3525261119e')
+
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  export PRODUCTION=1
+  export DYNAMIC_LIBXDP=1
+  export FORCE_SYSTEM_LIBBPF=1
+  export PREFIX="/usr"
+  ./configure
+  make V=1
+}
+
+package_xdp-tools() {
+  cd "${pkgname}-${pkgver}"
+  pkgdesc="Utilities and example programs for use with XDP"
+  depends=("libxdp")
+  export DESTDIR="${pkgdir}"
+  export SBINDIR="/usr/bin"
+  export PREFIX="/usr"
+  make install V=1
+
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 LICENSE LICENSES/* -t 
"${pkgdir}/usr/share/licenses/${pkgname}"
+  rm -rf "${pkgdir}"/usr/share/xdp-tools \
+ "${pkgdir}"/usr/lib/libxdp* \
+ "${pkgdir}"/usr/lib/bpf/{xdp-dispatcher*,xsk_*} \
+ "${pkgdir}"/usr/lib/pkgconfig \
+ "${pkgdir}"/usr/include \
+ "${pkgdir}"/usr/share/man/man3
+}
+
+package_libxdp() {
+  cd "${pkgbase}-${pkgver}"
+  pkgdesc="The libxdp package contains the libxdp library for managing XDP 
programs"
+  provides=('libxdp.so')
+  export DESTDIR="${pkgdir}"
+  export SBINDIR="/usr/bin"
+  export PREFIX="/usr"
+  make libxdp_install V=1
+
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 LICENSE LICENSES/* -t 
"${pkgdir}/usr/share/licenses/${pkgname}"
+}



[arch-commits] Commit in xdp-tools/trunk (PKGBUILD)

2022-05-08 Thread Morten Linderud via arch-commits
Date: Sunday, May 8, 2022 @ 12:02:43
  Author: foxboron
Revision: 1196250

upgpkg: xdp-tools 1.2.3-8: upgpkg: xdp-tools 1.2.3-8

Modified:
  xdp-tools/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 07:45:37 UTC (rev 1196249)
+++ PKGBUILD2022-05-08 12:02:43 UTC (rev 1196250)
@@ -4,7 +4,7 @@
 pkgbase=xdp-tools
 pkgname=(xdp-tools libxdp)
 pkgver=1.2.3
-pkgrel=7
+pkgrel=8
 pkgdesc='Utilities and example programs for use with XDP'
 url='https://github.com/xdp-project/xdp-tools'
 license=('GPL' 'LGPL' 'BSD2')
@@ -38,9 +38,10 @@
 
   install -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm644 LICENSE LICENSES/* -t 
"${pkgdir}/usr/share/licenses/${pkgname}"
-  rm -rf "${pkgdir}"/usr/share/xdp-tools/*.sh \
- "${pkgdir}"/usr/share/xdp-tools/test* \
- "${pkgdir}"/usr/lib \
+  rm -rf "${pkgdir}"/usr/share/xdp-tools \
+ "${pkgdir}"/usr/lib/libxdp* \
+ "${pkgdir}"/usr/lib/bpf/{xdp-dispatcher*,xsk_*} \
+ "${pkgdir}"/usr/lib/pkgconfig \
  "${pkgdir}"/usr/include \
  "${pkgdir}"/usr/share/man/man3
 }
@@ -53,4 +54,7 @@
   export SBINDIR="/usr/bin"
   export PREFIX="/usr"
   make libxdp_install V=1
+
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 LICENSE LICENSES/* -t 
"${pkgdir}/usr/share/licenses/${pkgname}"
 }



[arch-commits] Commit in grafana-zabbix/repos/community-any (PKGBUILD PKGBUILD)

2022-05-08 Thread Florian Pritz via arch-commits
Date: Sunday, May 8, 2022 @ 07:45:37
  Author: bluewind
Revision: 1196249

archrelease: copy trunk to community-any

Added:
  grafana-zabbix/repos/community-any/PKGBUILD
(from rev 1196248, grafana-zabbix/trunk/PKGBUILD)
Deleted:
  grafana-zabbix/repos/community-any/PKGBUILD

--+
 PKGBUILD |   71 +++--
 1 file changed, 32 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 07:45:34 UTC (rev 1196248)
+++ PKGBUILD2022-05-08 07:45:37 UTC (rev 1196249)
@@ -1,39 +0,0 @@
-# Maintainer: Florian Pritz 
-pkgname=grafana-zabbix
-pkgver=4.2.6
-pkgrel=2
-pkgdesc="Zabbix plugin for Grafana dashboard"
-arch=('any')
-url="https://github.com/alexanderzobnin/grafana-zabbix";
-license=('APACHE')
-depends=('grafana')
-makedepends=(yarn libfaketime go git nodejs-lts-gallium)
-source=("$pkgname-$pkgver-retagged-1.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz";
-
grafana-zabbix-sass-update-for-node-16.patch::https://github.com/alexanderzobnin/grafana-zabbix/commit/a09d8a983e051cbe4a959c40224426edc3468d10.patch)
-sha256sums=('913efd1d6bfb903eb7e40d79d58fc1d9cf5041d4764bc1f34f1c5997439de1ab'
-   
'ec1c6863ba97db0da505569b0992bc6a3158d54621db20235635e4fbd36eb15c')
-
-prepare() {
-   cd "$pkgname-$pkgver"
-   patch -Np1 -i ../grafana-zabbix-sass-update-for-node-16.patch
-}
-
-build() {
-   cd "$pkgname-$pkgver"
-   make install
-   make build
-   make dist
-}
-
-check() {
-   cd "$pkgname-$pkgver"
-   # Force UTC timezone so that tests pass, even after a DST change
-   PATH="$PATH:/build/go/bin" TZ=UTC make test lint
-}
-
-package() {
-   cd "$pkgname-$pkgver"
-   install -dm755 
"$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
-   cp -r dist/* 
"$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
-   rm -rf 
"$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app/node_modules"
-}

Copied: grafana-zabbix/repos/community-any/PKGBUILD (from rev 1196248, 
grafana-zabbix/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 07:45:37 UTC (rev 1196249)
@@ -0,0 +1,32 @@
+# Maintainer: Florian Pritz 
+pkgname=grafana-zabbix
+pkgver=4.2.8
+pkgrel=1
+pkgdesc="Zabbix plugin for Grafana dashboard"
+arch=('any')
+url="https://github.com/alexanderzobnin/grafana-zabbix";
+license=('APACHE')
+depends=('grafana')
+makedepends=(yarn libfaketime go git nodejs-lts-gallium)
+source=("$pkgname-$pkgver-retagged-1.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz";)
+sha256sums=('052ef487b01861b59ea8171282b774f0fae13c3cc1e6232fda773be59fb9e754')
+
+build() {
+   cd "$pkgname-$pkgver"
+   make install
+   make build
+   make dist
+}
+
+check() {
+   cd "$pkgname-$pkgver"
+   # Force UTC timezone so that tests pass, even after a DST change
+   PATH="$PATH:/build/go/bin" TZ=UTC make test lint
+}
+
+package() {
+   cd "$pkgname-$pkgver"
+   install -dm755 
"$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
+   cp -r dist/* 
"$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
+   rm -rf 
"$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app/node_modules"
+}



[arch-commits] Commit in grafana-zabbix/trunk (PKGBUILD)

2022-05-08 Thread Florian Pritz via arch-commits
Date: Sunday, May 8, 2022 @ 07:45:34
  Author: bluewind
Revision: 1196248

upgpkg: grafana-zabbix 4.2.8-1: upstream update

Modified:
  grafana-zabbix/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-08 07:34:34 UTC (rev 1196247)
+++ PKGBUILD2022-05-08 07:45:34 UTC (rev 1196248)
@@ -1,7 +1,7 @@
 # Maintainer: Florian Pritz 
 pkgname=grafana-zabbix
-pkgver=4.2.6
-pkgrel=2
+pkgver=4.2.8
+pkgrel=1
 pkgdesc="Zabbix plugin for Grafana dashboard"
 arch=('any')
 url="https://github.com/alexanderzobnin/grafana-zabbix";
@@ -8,16 +8,9 @@
 license=('APACHE')
 depends=('grafana')
 makedepends=(yarn libfaketime go git nodejs-lts-gallium)
-source=("$pkgname-$pkgver-retagged-1.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz";
-
grafana-zabbix-sass-update-for-node-16.patch::https://github.com/alexanderzobnin/grafana-zabbix/commit/a09d8a983e051cbe4a959c40224426edc3468d10.patch)
-sha256sums=('913efd1d6bfb903eb7e40d79d58fc1d9cf5041d4764bc1f34f1c5997439de1ab'
-   
'ec1c6863ba97db0da505569b0992bc6a3158d54621db20235635e4fbd36eb15c')
+source=("$pkgname-$pkgver-retagged-1.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz";)
+sha256sums=('052ef487b01861b59ea8171282b774f0fae13c3cc1e6232fda773be59fb9e754')
 
-prepare() {
-   cd "$pkgname-$pkgver"
-   patch -Np1 -i ../grafana-zabbix-sass-update-for-node-16.patch
-}
-
 build() {
cd "$pkgname-$pkgver"
make install



[arch-commits] Commit in smokeping/repos/community-any (10 files)

2022-05-08 Thread Florian Pritz via arch-commits
Date: Sunday, May 8, 2022 @ 07:34:34
  Author: bluewind
Revision: 1196247

archrelease: copy trunk to community-any

Added:
  smokeping/repos/community-any/PKGBUILD
(from rev 1196246, smokeping/trunk/PKGBUILD)
  smokeping/repos/community-any/htdocs-makefile.patch
(from rev 1196246, smokeping/trunk/htdocs-makefile.patch)
  smokeping/repos/community-any/service
(from rev 1196246, smokeping/trunk/service)
  smokeping/repos/community-any/smokeping.sysusers
(from rev 1196246, smokeping/trunk/smokeping.sysusers)
  smokeping/repos/community-any/smokeping.tmpfiles
(from rev 1196246, smokeping/trunk/smokeping.tmpfiles)
Deleted:
  smokeping/repos/community-any/PKGBUILD
  smokeping/repos/community-any/htdocs-makefile.patch
  smokeping/repos/community-any/service
  smokeping/repos/community-any/smokeping.sysusers
  smokeping/repos/community-any/smokeping.tmpfiles

---+
 PKGBUILD  |  102 
 htdocs-makefile.patch |   22 +-
 service   |   23 +-
 smokeping.sysusers|2 
 smokeping.tmpfiles|2 
 5 files changed, 76 insertions(+), 75 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2022-05-08 07:34:27 UTC (rev 1196246)
+++ PKGBUILD2022-05-08 07:34:34 UTC (rev 1196247)
@@ -1,51 +0,0 @@
-# Maintainer: Florian Pritz 
-# Contributor: Christos Nouskas nous 
-
-pkgname=smokeping
-pkgver=2.8.2
-pkgrel=1
-pkgdesc="A tool to keep track of your network latency"
-arch=('any')
-url="https://oss.oetiker.ch/smokeping/";
-license=('GPL2')
-depends=('perl-config-grammar' 'perl-digest-hmac' 'perl-libwww' 'rrdtool' 
'perl-fcgi' 'perl-cgi-fast'
- 'perl-io-tty' 'perl-net-dns' 'perl-net-snmp' 'perl-net-telnet' 
'perl-ldap' 'perl-net-openssh')
-source=("${pkgname}_release-$pkgver.tar.gz::https://github.com/oetiker/SmokePing/releases/download/$pkgver/smokeping-$pkgver.tar.gz";
-smokeping.sysusers
-smokeping.tmpfiles
-service)
-sha256sums=('29e61118b455e23b969ada5f8e2ab432d3e2ef87d4afe2c86de4a03d7188b6ea'
-'ab3b399f58118fc31fac5f627814bbb3b1d7752dd3b4fed2d6b7ee58f24fbd2e'
-'afd3196804a120866e8e5f207f177c96fd64b36c974888d8287fba3c216b1583'
-'4691650aed6c7341bf3a898f63c8ad03f2453d4ce9874e83f24ced5ee21317d9')
-
-build() {
-  cd "$srcdir"/smokeping-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc/smokeping 
--with-htdocs-dir=/srv/http/smokeping
-
-  # prevent the build system from packaging CPAN deps
-  rm -rf thirdparty/CPAN
-  mkdir thirdparty/CPAN
-  touch cpanfile "thirdparty/cpanfile-$(perl -MConfig -e 'my $v 
=$Config{version}; $v =~ s/.\d+$//;print $v;').snapshot"
-  touch thirdparty/touch thirdparty/CPAN/touch
-
-  make
-}
-
-package() {
-  cd "$srcdir"/smokeping-${pkgver}
-
-  # We package CPAN modules separately
-  mkdir -p thirdparty/lib/perl5/removeme
-
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir/usr/lib/removeme"
-
-  install -Dm644 "$srcdir/service" 
"$pkgdir/usr/lib/systemd/system/smokeping.service"
-  install -Dm644 "$srcdir/smokeping.sysusers" 
"$pkgdir/usr/lib/sysusers.d/smokeping.conf"
-  install -Dm644 "$srcdir/smokeping.tmpfiles" 
"$pkgdir/usr/lib/tmpfiles.d/smokeping.conf"
-  chown -R 181:181 "$pkgdir"/{etc/smokeping,srv/http/smokeping}
-  chmod 700 "$pkgdir/etc/smokeping"
-}

Copied: smokeping/repos/community-any/PKGBUILD (from rev 1196246, 
smokeping/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2022-05-08 07:34:34 UTC (rev 1196247)
@@ -0,0 +1,51 @@
+# Maintainer: Florian Pritz 
+# Contributor: Christos Nouskas nous 
+
+pkgname=smokeping
+pkgver=2.8.2
+pkgrel=2
+pkgdesc="A tool to keep track of your network latency"
+arch=('any')
+url="https://oss.oetiker.ch/smokeping/";
+license=('GPL2')
+depends=('perl-config-grammar' 'perl-digest-hmac' 'perl-libwww' 'rrdtool' 
'perl-fcgi' 'perl-cgi-fast'
+ 'perl-io-tty' 'perl-net-dns' 'perl-net-snmp' 'perl-net-telnet' 
'perl-ldap' 'perl-net-openssh')
+source=("${pkgname}_release-$pkgver.tar.gz::https://github.com/oetiker/SmokePing/releases/download/$pkgver/smokeping-$pkgver.tar.gz";
+smokeping.sysusers
+smokeping.tmpfiles
+service)
+sha256sums=('29e61118b455e23b969ada5f8e2ab432d3e2ef87d4afe2c86de4a03d7188b6ea'
+'ab3b399f58118fc31fac5f627814bbb3b1d7752dd3b4fed2d6b7ee58f24fbd2e'
+'afd3196804a120866e8e5f207f177c96fd64b36c974888d8287fba3c216b1583'
+'0e0b418c2f1688990c390297122ade6a0b657e08eb8f7c085fea775cc038074c')
+
+build() {
+  cd "$srcdir"/smokeping-${pkgver}
+
+  ./configure --prefix=/usr --sysconfdir=/etc/smokeping 
--with-htdocs-dir=/srv/http/smokeping
+
+  # prevent the build system from packaging CPAN deps
+  rm -rf thirdparty/CPAN
+  mkdir thirdparty/CPAN
+  touch cpanfile "thirdparty/cpanfile-$(perl -MConfig -e 'my $v 

[arch-commits] Commit in smokeping/trunk (PKGBUILD service)

2022-05-08 Thread Florian Pritz via arch-commits
Date: Sunday, May 8, 2022 @ 07:34:27
  Author: bluewind
Revision: 1196246

upgpkg: smokeping 2.8.2-2: depend on network-online.target, FS#74561

Modified:
  smokeping/trunk/PKGBUILD
  smokeping/trunk/service

--+
 PKGBUILD |4 ++--
 service  |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-07 23:33:05 UTC (rev 1196245)
+++ PKGBUILD2022-05-08 07:34:27 UTC (rev 1196246)
@@ -3,7 +3,7 @@
 
 pkgname=smokeping
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to keep track of your network latency"
 arch=('any')
 url="https://oss.oetiker.ch/smokeping/";
@@ -17,7 +17,7 @@
 sha256sums=('29e61118b455e23b969ada5f8e2ab432d3e2ef87d4afe2c86de4a03d7188b6ea'
 'ab3b399f58118fc31fac5f627814bbb3b1d7752dd3b4fed2d6b7ee58f24fbd2e'
 'afd3196804a120866e8e5f207f177c96fd64b36c974888d8287fba3c216b1583'
-'4691650aed6c7341bf3a898f63c8ad03f2453d4ce9874e83f24ced5ee21317d9')
+'0e0b418c2f1688990c390297122ade6a0b657e08eb8f7c085fea775cc038074c')
 
 build() {
   cd "$srcdir"/smokeping-${pkgver}

Modified: service
===
--- service 2022-05-07 23:33:05 UTC (rev 1196245)
+++ service 2022-05-08 07:34:27 UTC (rev 1196246)
@@ -1,6 +1,7 @@
 [Unit]
 Description=SmokePing Daemon
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 User=smokeping