From 9234f72cd1cf66f068b82578e14a3b47a6634209 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Wed, 1 Apr 2020 17:29:50 -0400
Subject: updpkg: nonsystemd/p11-kit 0.23.20-3

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

(limited to 'nonsystemd')

diff --git a/nonsystemd/p11-kit/PKGBUILD b/nonsystemd/p11-kit/PKGBUILD
index 4d9e37e63..7192bf8b9 100644
--- a/nonsystemd/p11-kit/PKGBUILD
+++ b/nonsystemd/p11-kit/PKGBUILD
@@ -1,21 +1,17 @@
-# Maintainer: David P. <megver83@parabola.nu>
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Maintainer: David P. <megver83@parabola.nu>
 
-# parabola changes and rationale:
-# remove 'systemd' dependency for [nonsystemd]
-
-pkgname=p11-kit
+pkgbase=p11-kit
+pkgname=(p11-kit libp11-kit)
 pkgver=0.23.20
-pkgrel=2
-pkgrel+=.nonsystemd1
-pkgdesc="Provides a way to load and enumerate PKCS#11 modules"
-arch=(x86_64 i686 armv7h)
+pkgrel=3
+pkgdesc="Loads and enumerates PKCS#11 modules"
 url="https://p11-glue.freedesktop.org"
-license=(BSD3)
-depends=(glibc libtasn1 libffi)
-makedepends=(gtk-doc git meson)
-provides=(libp11-kit.so)
+arch=(x86_64)
+arch+=(i686 armv7h)
+license=(BSD)
+makedepends=(gtk-doc git meson libtasn1 libffi)
 source=("git+https://github.com/p11-glue/p11-kit?signed#tag=$pkgver")
 sha256sums=('SKIP')
 validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF'  # Stef Walter
@@ -28,10 +24,10 @@ prepare() {
 build() {
   arch-meson p11-kit build \
     --buildtype debugoptimized \
-    -D systemd=disabled \
     -D gtk_doc=true \
     -D man=true \
-    -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
+    -D trust_paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source \
+    -D systemd=disabled
   ninja -C build
 }
 
@@ -39,10 +35,39 @@ check() {
   meson test -C build --print-errorlogs
 }
 
-package() {
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_p11-kit() {
+  depends=("libp11-kit=$pkgver-$pkgrel" libp11-kit.so)
+
   DESTDIR="$pkgdir" meson install -C build
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit/COPYING
   ln -sr "$pkgdir/usr/bin/update-ca-trust" "$pkgdir/usr/lib/p11-kit/trust-extract-compat"
+
+  # Split libp11-kit
+  _pick lib "$pkgdir"/usr/include
+  _pick lib "$pkgdir"/usr/lib/{p11-kit-proxy.so,libp11-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
+}
+
+package_libp11-kit() {
+  pkgdesc+=" (library)"
+  depends=(glibc libtasn1 libffi)
+  provides=(libp11-kit.so)
+
+  mv lib/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 p11-kit/COPYING
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3