updpkg: nonsystemd/elogind 246.10-1

Signed-off-by: David P <megver83@parabola.nu>

4 files changed, 45 insertions, 62 deletions

diff --git a/nonsystemd/elogind/PKGBUILD b/nonsystemd/elogind/PKGBUILD
index de706a693..ba11996f2 100644
--- a/nonsystemd/elogind/PKGBUILD
+++ b/nonsystemd/elogind/PKGBUILD
@@ -14,21 +14,21 @@
 
 pkgbase=elogind
 pkgname=('elogind' 'libelogind')
-pkgver=243.7
-pkgrel=2
+pkgver=246.10
+pkgrel=1
 pkgdesc="The systemd project's logind, extracted to a standalone package"
-arch=('x86_64' 'i686' 'armv7h')
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 url="https://github.com/elogind/elogind"
 license=('GPL' 'LGPL2.1')
-conflicts=('systemd-libsystemd')
-makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus'
-            'libseccomp' 'meson' 'kexec-tools' 'openrc')
+makedepends=('acl' 'intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus'
+            'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap')
 options=('!libtool')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz"
-        'elogind.confd' 'elogind.initd')
-sha256sums=('941fde1ffbdf51d61e47fcebc49e2fc2b1347fcf3b0522bfa9d65ad5da653e53'
-            '344db76bf8aadfba4363c63aacd93c945a647bd5e425d756cbfd9cb4453afc66'
-            '2fc375b3aa61cb63b16c55840acaa69d26b16a01d393ee129d77c804efdac278')
+        #'elogind.confd' 'elogind.initd'
+        'elogind.sv.initd')
+sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922'
+            'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')
 
 build() {
     local meson_options=(
@@ -39,6 +39,7 @@ build() {
         -Ddefault-hierarchy=hybrid
         -Dcgroup-controller=openrc
         -Ddefault-kill-user-processes=false
+        -Dman=true
     )
 
     arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}"
@@ -52,44 +53,46 @@ check(){
 
 package_elogind() {
     pkgdesc="The systemd project's logind, extracted to a standalone package"
-    provides=("systemd=${pkgver}")
-    depends=('pam' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
+    provides=("systemd=${pkgver}" 'logind')
+    depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
     optdepends=('polkit: polkit support')
     backup=('etc/elogind/logind.conf')
 
-    provides+=("${pkgname}-openrc")
-    conflicts+=('systemd-udev' "${pkgname}-openrc")
+    provides=("${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
 
-    # Init scripts
-    install -Dm755 ${srcdir}/elogind.initd ${pkgdir}/etc/init.d/elogind
-    install -Dm755 ${srcdir}/elogind.confd ${pkgdir}/etc/conf.d/elogind
+    install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d
 
-    install -d "${pkgdir}/etc/runlevels/boot"
-    ln -sf "/etc/init.d/elogind" "${pkgdir}/etc/runlevels/boot/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
 }
 
 package_libelogind(){
     pkgdesc="elogind client libraries"
-    groups=('base-devel')
-    provides=('libelogind.so'
+    provides=('libelogind.so' 'liblogind'
              "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
 }
diff --git a/nonsystemd/elogind/elogind.confd b/nonsystemd/elogind/elogind.confd
deleted file mode 100644
index 167260a42..000000000
--- a/nonsystemd/elogind/elogind.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/elogind: config file for /etc/init.d/elogind
-
-# this is the elogind executable
-ELOGIND_EXEC="/usr/lib/elogind/elogind"
-
-# this is where elogind will store its pid file
-ELOGIND_PIDFILE="/run/elogind.pid"
diff --git a/nonsystemd/elogind/elogind.initd b/nonsystemd/elogind/elogind.initd
deleted file mode 100644
index 3329699fc..000000000
--- a/nonsystemd/elogind/elogind.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need dbus
-
-	# Make sure elogind is up before xdm starts any dm
-	before xdm
-}
-
-start() {
-	ebegin "Starting elogind"
-
-	start-stop-daemon --start --quiet \
-		--pidfile "${ELOGIND_PIDFILE}" \
-		--exec "${ELOGIND_EXEC}" -- --daemon
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping elogind"
-	start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}"
-	eend $?
-}
diff --git a/nonsystemd/elogind/elogind.sv.initd b/nonsystemd/elogind/elogind.sv.initd
new file mode 100644
index 000000000..79194b2bb
--- /dev/null
+++ b/nonsystemd/elogind/elogind.sv.initd
@@ -0,0 +1,12 @@
+#!/usr/bin/openrc-run
+# Copyright 2021 Artix Linux
+# Distributed under the terms of the GNU General Public License v2
+
+supervisor=supervise-daemon
+command="/usr/lib/elogind/elogind"
+
+depend() {
+    need dbus
+    provide logind
+    before xdm
+}