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

[David Runge]

    Date: Tuesday, August 16, 2022 @ 14:42:31
  Author: dvzrv
Revision: 453003

upgpkg: libgit2-glib 1.1.0-1: Upgrade to 1.1.0.

Split out documentation to split package libgit2-glib-docs.
Remove unnecessary quotes and curly braces.
Remove unused prepare().
Update maintainer info.

Modified:
  libgit2-glib/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-16 14:00:57 UTC (rev 453002)
+++ PKGBUILD	2022-08-16 14:42:31 UTC (rev 453003)
@@ -1,28 +1,35 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: David Runge <dvzrv at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
-pkgname=libgit2-glib
-pkgver=1.0.0.1
-pkgrel=2
+pkgbase=libgit2-glib
+pkgname=(libgit2-glib libgit2-glib-docs)
+_commit=274f81c596b7c248407c14d4a7d58d72fb12cedc  # tags/v1.1.0^{}
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="GLib wrapper for libgit2"
-url="https://wiki.gnome.org/Projects/Libgit2-glib"
-license=('LGPL2.1')
-arch=('x86_64')
-depends=('glibc')
-makedepends=('gobject-introspection' 'glib2' 'libgit2' 'gtk-doc' 'meson'
-             'python-gobject' 'vala' 'git')
-_commit=391b764ac7e2915ed564f5e144cfdb1ae51fbc4e  # tags/v1.0.0.1^0
-source=("git+https://gitlab.gnome.org/GNOME/libgit2-glib.git#commit=$_commit")
+url="https://gitlab.gnome.org/GNOME/libgit2-glib"
+license=(LGPL2.1)
+arch=(x86_64)
+makedepends=(gi-docgen git glib2 gobject-introspection gtk-doc libgit2 meson
+python-gobject vala)
+options=(debug)
+source=(git+$url.git#commit=$_commit)
 sha256sums=('SKIP')
 
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
+_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() {
+pkgver() {
   cd $pkgname
+  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/v//g;s/-/./g'
 }
 
 build() {
@@ -34,16 +41,33 @@
   meson test -C build --print-errorlogs
 }
 
-package() {
-  depends+=('libgio-2.0.so' 'libgit2.so' 'libglib-2.0.so' 'libgobject-2.0.so')
-  provides+=('libgit2-glib-1.0.so')
+package_libgit2-glib() {
+  depends=(
+    glib2 libgio-2.0.so libglib-2.0.so libgobject-2.0.so
+    glibc
+    libgit2 libgit2.so
+  )
+  optdepends=(
+    'libgit2-glib-docs: for developer documentation'
+    'python-gobject: for Python integration'
+  )
+  provides=(libgit2-glib-1.0.so)
 
   meson install -C build --destdir "$pkgdir"
+  (
+    cd "$pkgdir"
+    _pick libgit2-glib-docs usr/share/gtk-doc
+  )
 
   # strip $pkgdir from embedded paths:
   python -m compileall -d "/usr/lib" "$pkgdir/usr/lib"
   python -O -m compileall -d "/usr/lib" "$pkgdir/usr/lib"
 
-  install -vDm 644 $pkgname/{AUTHORS,ChangeLog,NEWS,README} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 $pkgname/{AUTHORS,ChangeLog,NEWS,README} -t "$pkgdir/usr/share/doc/$pkgname/"
 }
+
+package_libgit2-glib-docs() {
+  pkgdesc+=" - documentation"
+
+  mv -v $pkgname/* "$pkgdir"
+}