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

[David Runge]

    Date: Thursday, February 3, 2022 @ 21:42:36
  Author: dvzrv
Revision: 436160

upgpkg: libcap-ng 0.8.2-7: Rebuild to add debug package.

Remove unneeded curly braces and quotes.
Simplify installation in package_*() using helper function to not run install
target twice.

Modified:
  libcap-ng/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-03 21:42:31 UTC (rev 436159)
+++ PKGBUILD	2022-02-03 21:42:36 UTC (rev 436160)
@@ -6,24 +6,35 @@
 pkgbase=libcap-ng
 pkgname=(libcap-ng python-capng)
 pkgver=0.8.2
-pkgrel=6
+pkgrel=7
 pkgdesc='A library for Linux that makes using posix capabilities easy'
+arch=(x86_64)
 url='https://people.redhat.com/sgrubb/libcap-ng/'
-arch=('x86_64')
-license=('LGPL2.1')
-depends=('glibc')
-makedepends=('python' 'swig')
+license=(LGPL2.1)
+depends=(glibc)
+makedepends=(python swig)
+options=(debug)
 source=(https://github.com/stevegrubb/libcap-ng/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
 sha512sums=('33832ee16972050a7c5cb20de21d766d5e88f5357db28166b83b05369f7ceea0b1aded39bae2d746d582ad4ee7703c131876fc4bcbc5d4b4eadd7dd429e8cf10')
 b2sums=('6bb07503421f88803ce2597289c18762f6ad06a3535ad7c6ffc28d2519adf2a130189332e56df174aa9be768340983ea6f7a6046b2209916815a19a0c6fa3693')
 
+_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
+}
+
 prepare() {
-  cd ${pkgbase}-${pkgver}
+  cd $pkgbase-$pkgver
   autoreconf -fiv
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd $pkgbase-$pkgver
   ./configure \
     --prefix=/usr \
     --enable-static=no \
@@ -33,31 +44,26 @@
 }
 
 check() {
-  cd ${pkgbase}-${pkgver}
-  make check
+  make check -C $pkgbase-$pkgver
 }
 
 package_libcap-ng() {
-  provides=('libcap-ng.so' 'libdrop_ambient.so')
+  provides=(libcap-ng.so libdrop_ambient.so)
 
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
 
-  # remove files provided by python-capng
-  rm -frv "${pkgdir}/usr/lib/python"*
+  (
+    cd "$pkgdir"
+    _pick python-capng usr/lib/python*
+  )
 }
 
 package_python-capng() {
   pkgdesc+=' (Python bindings)'
-  depends+=('libcap-ng.so')
-  provides=('python-libcap-ng')
+  depends+=(libcap-ng.so)
+  provides=(python-libcap-ng)
 
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # remove files provided by libcap-ng
-  rm -frv "${pkgdir}/usr/lib/"{lib*,pkgconfig}
-  rm -frv "${pkgdir}/usr/"{bin,include,share}
+  mv -v python-capng/* "$pkgdir"
 }
 
 # vim: ts=2 sw=2 et: