From ccde7fb3f5856a8b5918e77e7f891d39b28cf3db Mon Sep 17 00:00:00 2001
From: Tyler Swagar <ugw.ugw@gmail.com>
Date: Jul 08 2022 18:44:28 +0000
Subject: updpkg: nonsystemd/elogind 246.10-1


---

diff --git a/nonsystemd/elogind/PKGBUILD b/nonsystemd/elogind/PKGBUILD
index cf3e8cf..ee13812 100644
--- a/nonsystemd/elogind/PKGBUILD
+++ b/nonsystemd/elogind/PKGBUILD
@@ -6,6 +6,7 @@
 # This package comes from Artix
 # Parabola changes:
 # - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous
+# - elogind: do not provide systemd-tools, openrc will conflict it
 # - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it,
 #   so in that way it will provide the correct version according to the
 #   architecture (libsystemd.so=0-64 or libsystemd.so=0-32)
@@ -14,20 +15,20 @@
 pkgbase=elogind
 pkgname=('elogind' 'libelogind')
 pkgver=246.10
-pkgrel=2
+pkgrel=1
 pkgdesc="The systemd project's logind, extracted to a standalone package"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/elogind/elogind"
 license=('GPL' 'LGPL2.1')
-makedepends=('acl' 'intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus'
-            'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap')
+conflicts=('systemd-libsystemd')
+makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus'
+            'libseccomp' 'meson' 'kexec-tools' 'openrc')
 options=('!libtool')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz"
-        #'elogind.confd' 'elogind.initd'
-        'elogind.sv.initd')
+        'elogind.confd' 'elogind.initd')
 sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922'
-            'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')
+            '344db76bf8aadfba4363c63aacd93c945a647bd5e425d756cbfd9cb4453afc66'
+            '2fc375b3aa61cb63b16c55840acaa69d26b16a01d393ee129d77c804efdac278')
 
 build() {
     local meson_options=(
@@ -38,7 +39,6 @@ build() {
         -Ddefault-hierarchy=hybrid
         -Dcgroup-controller=openrc
         -Ddefault-kill-user-processes=false
-        -Dman=true
     )
 
     arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}"
@@ -52,46 +52,44 @@ check(){
 
 package_elogind() {
     pkgdesc="The systemd project's logind, extracted to a standalone package"
-    provides=("systemd=${pkgver}" 'logind')
-    depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
+    provides=("systemd=${pkgver}")
+    depends=('pam' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
     optdepends=('polkit: polkit support')
     backup=('etc/elogind/logind.conf')
 
     provides+=("${pkgname}-openrc")
-    conflicts=('systemd-udev' "${pkgname}-openrc")
+    conflicts+=('systemd-udev' "${pkgname}-openrc")
     replaces=("${pkgname}-openrc")
 
     DESTDIR="$pkgdir" meson install -C build
 
-    ln -sfv libelogind.pc "${pkgdir}"/usr/lib/pkgconfig/libsystemd.pc
+    ln -sfv libelogind.pc ${pkgdir}/usr/lib/pkgconfig/libsystemd.pc
 
-    install -dm755 "${srcdir}"/_libelogind
-    mv -v "${pkgdir}"/usr/lib/libelogind*.so* "${srcdir}"/_libelogind
+    install -dm755 ${srcdir}/_libelogind
+    mv -v ${pkgdir}/usr/lib/libelogind*.so* ${srcdir}/_libelogind
 
-    install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d
+    # Init scripts
+    install -Dm755 ${srcdir}/elogind.initd ${pkgdir}/etc/init.d/elogind
+    install -Dm755 ${srcdir}/elogind.confd ${pkgdir}/etc/conf.d/elogind
 
-    # Init script
-    #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind
-    #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind
-    install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind
-
-    install -d "${pkgdir}"/etc/runlevels/boot
-    ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind
+    install -d "${pkgdir}/etc/runlevels/boot"
+    ln -sf "/etc/init.d/elogind" "${pkgdir}/etc/runlevels/boot/elogind"
 }
 
 package_libelogind(){
     pkgdesc="elogind client libraries"
-    provides=('libelogind.so' 'liblogind')
-    provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}"
+    groups=('base-devel')
+    provides=('libelogind.so'
+             "libsystemd=${pkgver}" "systemd-libs=${pkgver}"
              'libsystemd.so')
-    conflicts=('libsystemd.so')
+    conflicts+=('libsystemd.so')
     depends=('libcap' 'libudev')
 
-    cd "${pkgbase}-${pkgver}"
+    cd ${pkgbase}-${pkgver}
 
-    install -dm755 "${pkgdir}"/usr/lib
-    mv "${srcdir}"/_libelogind/libelogind*.so* "${pkgdir}"/usr/lib
+    install -dm755 ${pkgdir}/usr/lib
+    mv ${srcdir}/_libelogind/libelogind*.so* ${pkgdir}/usr/lib
 
-    install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so
-    ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0
+    install -m755 ${pkgdir}/usr/lib/libelogind.so ${pkgdir}/usr/lib/libsystemd.so
+    ln -sfv libsystemd.so ${pkgdir}/usr/lib/libsystemd.so.0
 }