From 4ba7f2fb59228f3e9120371954ecc7f3fc9db0d5 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sun, 27 Jun 2021 22:10:53 -0400
Subject: updpkg: nonsystemd/p11-kit 0.24.0-1

Signed-off-by: David P <megver83@parabola.nu>
---
 nonsystemd/p11-kit/PKGBUILD | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'nonsystemd/p11-kit')

diff --git a/nonsystemd/p11-kit/PKGBUILD b/nonsystemd/p11-kit/PKGBUILD
index cbc71019b..152fb5b37 100644
--- a/nonsystemd/p11-kit/PKGBUILD
+++ b/nonsystemd/p11-kit/PKGBUILD
@@ -1,35 +1,35 @@
-# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 # Maintainer: David P. <megver83@parabola.nu>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=p11-kit
 pkgname=(p11-kit libp11-kit)
-pkgver=0.23.20
-pkgrel=5
-pkgrel+=.nonsystemd1
+pkgver=0.24.0
+pkgrel=1
 pkgdesc="Loads and enumerates PKCS#11 modules"
 url="https://p11-glue.freedesktop.org"
 arch=(x86_64)
 arch+=(i686 armv7h)
-license=(BSD3)
-makedepends=(gtk-doc git meson libtasn1 libffi)
-source=("git+https://github.com/p11-glue/p11-kit?signed#tag=$pkgver")
-sha256sums=('SKIP')
+license=(BSD)
+makedepends=(gtk-doc meson libtasn1 libffi bash-completion)
+source=(https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig})
+sha256sums=('81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685'
+            'SKIP')
 validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF'  # Stef Walter
               '462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
 
 prepare() {
-  cd p11-kit
+  cd p11-kit-$pkgver
 }
 
 build() {
-  arch-meson p11-kit build \
+  arch-meson p11-kit-$pkgver build \
     --buildtype debugoptimized \
     -D gtk_doc=true \
     -D man=true \
-    -D systemd=disabled \
-    -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
-  ninja -C build
+    -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source \
+    -D systemd=disabled
+  meson compile -C build
 }
 
 check() {
@@ -47,10 +47,10 @@ _pick() {
 }
 
 package_p11-kit() {
-  depends=("libp11-kit=$pkgver-$pkgrel" libp11-kit.so)
+  depends=("libp11-kit=$pkgver-$pkgrel" coreutils libp11-kit.so)
 
-  DESTDIR="$pkgdir" meson install -C build
-  ln -sr "$pkgdir/usr/bin/update-ca-trust" "$pkgdir/usr/lib/p11-kit/trust-extract-compat"
+  meson install -C build --destdir "$pkgdir"
+  ln -srf "$pkgdir/usr/bin/update-ca-trust" "$pkgdir/usr/lib/p11-kit/trust-extract-compat"
 
   # Split libp11-kit
   _pick lib "$pkgdir"/usr/include
@@ -58,7 +58,7 @@ package_p11-kit() {
   _pick lib "$pkgdir"/usr/lib/{pkcs11,pkgconfig}
   _pick lib "$pkgdir"/usr/share/{locale,p11-kit}
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit/COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit-$pkgver/COPYING
 }
 
 package_libp11-kit() {
@@ -68,7 +68,7 @@ package_libp11-kit() {
 
   mv lib/* "$pkgdir"
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit/COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit-$pkgver/COPYING
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3