Update to 243.7

2 files changed, 50 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aff1ad0ffd75..d111528c1a8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = elogind
 	pkgdesc = The systemd project's logind, extracted to a standalone package
-	pkgver = 229.4
+	pkgver = 243.7
 	pkgrel = 1
 	url = https://github.com/elogind/elogind
 	arch = i686
@@ -10,14 +10,13 @@ pkgbase = elogind
 	makedepends = libtool
 	makedepends = gperf
 	makedepends = gtk-doc
-	makedepends = dbus-nosystemd
 	makedepends = git
 	makedepends = libcap
+	makedepends = meson
+	makedepends = dbus-nosystemd
 	options = !libtool
-	source = elogind-5814139990daf10155b4fb0951ee456ac9c97a4b.tar.gz::https://github.com/elogind/elogind/archive/5814139990daf10155b4fb0951ee456ac9c97a4b.tar.gz
-	source = elogind-docs.patch
-	sha256sums = 43cd1ad357fe6bfa2369a4003e2737ec994a53471745679c97e09a7dcbd9d04a
-	sha256sums = 25643e563250b0d322f817288cbe999f1cc2e4804c875725bb92fe5094a902b4
+	source = git+https://github.com/elogind/elogind#tag=v243.7
+	sha256sums = SKIP
 
 pkgname = elogind
 	pkgdesc = The systemd project's logind, extracted to a standalone package
@@ -28,7 +27,7 @@ pkgname = elogind
 	depends = dbus-x11
 	optdepends = elogind-openrc: elogind initscript
 	optdepends = dbus-openrc: dbus initscript
-	provides = elogind=229.4
+	provides = elogind=243.7
 	conflicts = systemd-sysvcompat
 	conflicts = consolekit
 
@@ -36,5 +35,5 @@ pkgname = libelogind
 	pkgdesc = elogind client libraries
 	depends = libcap
 	provides = libelogind.so
-	provides = libelogind=229.4
+	provides = libelogind=243.7
 
diff --git a/PKGBUILD b/PKGBUILD
index 0536ffefdb9c..2ff33bace1b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,74 +1,63 @@
-# Maintainer: artoo <artoo@manjaro.org>
-
-_pkgname=elogind
-_commit=5814139990daf10155b4fb0951ee456ac9c97a4b
+# Contributor: artoo <artoo@manjaro.org>
+# Maintainer: Nathan Owens <ndowens at artixlinux.org>
 
 pkgbase=elogind
 pkgname=('elogind' 'libelogind')
-pkgver=229.4
+pkgver=243.7
 pkgrel=1
 pkgdesc="The systemd project's logind, extracted to a standalone package"
 arch=('i686' 'x86_64')
 url="https://github.com/elogind/elogind"
 license=('GPL')
-makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'dbus-nosystemd' 'git' 'libcap')
+makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc'
+	     'git' 'libcap' 'meson' 'dbus-nosystemd')
 options=('!libtool')
-source=("elogind-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz"
-        "elogind-docs.patch")
-sha256sums=('43cd1ad357fe6bfa2369a4003e2737ec994a53471745679c97e09a7dcbd9d04a'
-            '25643e563250b0d322f817288cbe999f1cc2e4804c875725bb92fe5094a902b4')
-
-prepare() {
-    cd ${_pkgname}-${_commit}
-    patch -Np 1 -i ${srcdir}/elogind-docs.patch
-    autoreconf -vim
+source=("git+https://github.com/elogind/elogind#tag=v${pkgver}")
+sha256sums=('SKIP')
+
+_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
 }
 
 build() {
-    cd ${_pkgname}-${_commit}
-    intltoolize
-    ./configure \
-        --sysconfdir=/etc \
-        --prefix=/usr \
-        --libdir=/usr/lib \
-        --libexecdir=/usr/lib \
-        --enable-split-usr \
-        --disable-smack \
-        --enable-acl \
-        --enable-pam \
-        --disable-kdbus
-
-    make
+  arch-meson $pkgbase build \
+	-D split-usr=true \
+	-D smack=true \
+	-D acl=true \
+	-D pam=true \
+	-D rootlibexecdir=/usr/lib
+   ninja -C build
 }
 
 package_elogind() {
-    pkgdesc="The systemd project's logind, extracted to a standalone package"
-    provides=("elogind=${pkgver}")
-    depends=('libelogind' 'pam' 'acl' 'dbus-x11')
-    conflicts=('systemd-sysvcompat' 'consolekit')
-    # replaces=('consolekit')
-    optdepends=('elogind-openrc: elogind initscript'
-                'dbus-openrc: dbus initscript')
-                #'polkit-elogind: polkit with elogind session tracking')
-    install=elogind.install
-
-    cd ${_pkgname}-${_commit}
-    make DESTDIR="${pkgdir}" install
-
-    mkdir ${srcdir}/_libelogind
-    mv -v ${pkgdir}/usr/lib/pkgconfig ${srcdir}/_libelogind
-	mv -v ${pkgdir}/usr/include/ ${srcdir}/_libelogind
-	mv -v ${pkgdir}/usr/lib/libelogind*.so* ${srcdir}/_libelogind
+  pkgdesc="The systemd project's logind, extracted to a standalone package"
+  provides=("elogind=${pkgver}")
+  depends=('libelogind' 'pam' 'acl' 'dbus-x11')
+  conflicts=('systemd-sysvcompat' 'consolekit')
+  optdepends=('elogind-openrc: elogind initscript'
+              'dbus-openrc: dbus initscript')
+  install=elogind.install
+
+  DESTDIR="${pkgdir}" meson install -C build
+  cd "$pkgdir"
+
+  _pick libelogind usr/lib/pkgconfig 
+  _pick libelogind usr/include
+  _pick libelogind usr/lib/libelogind*.so*
+
+  rm -rf "$pkgdir"/usr/share/doc
 }
 
 package_libelogind(){
-    pkgdesc="elogind client libraries"
-    provides=('libelogind.so' "libelogind=${pkgver}")
-    depends=('libcap')
+  pkgdesc="elogind client libraries"
+  provides=('libelogind.so' "libelogind=${pkgver}")
+  depends=('libcap')
 
-    cd ${_pkgname}-${_commit}
-    install -dm755 ${pkgdir}/usr/lib
-    mv ${srcdir}/_libelogind/include ${pkgdir}/usr
-    mv ${srcdir}/_libelogind/pkgconfig ${pkgdir}/usr/lib
-    mv ${srcdir}/_libelogind/libelogind*.so* ${pkgdir}/usr/lib
+  mv libelogind/* "$pkgdir"
 }