From 2638950323143e5d59c8de023d2283b8eae6c9d3 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Wed, 19 Aug 2020 21:14:31 -0400
Subject: updpkg: nonsystemd/elogind 243.7-2

Signed-off-by: David P <megver83@parabola.nu>
---
 nonsystemd/elogind/PKGBUILD | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'nonsystemd/elogind')

diff --git a/nonsystemd/elogind/PKGBUILD b/nonsystemd/elogind/PKGBUILD
index 523ea7f1c..de706a693 100644
--- a/nonsystemd/elogind/PKGBUILD
+++ b/nonsystemd/elogind/PKGBUILD
@@ -3,10 +3,19 @@
 # Contributor: Luke Shumaker <lukeshu@parabola.nu>
 # Maintainer (Artix): artoo <artoo@artixlinux.org>
 
+# 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)
+# - remove prepare()
+
 pkgbase=elogind
 pkgname=('elogind' 'libelogind')
 pkgver=243.7
-pkgrel=1
+pkgrel=2
 pkgdesc="The systemd project's logind, extracted to a standalone package"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/elogind/elogind"
@@ -21,10 +30,6 @@ sha256sums=('941fde1ffbdf51d61e47fcebc49e2fc2b1347fcf3b0522bfa9d65ad5da653e53'
             '344db76bf8aadfba4363c63aacd93c945a647bd5e425d756cbfd9cb4453afc66'
             '2fc375b3aa61cb63b16c55840acaa69d26b16a01d393ee129d77c804efdac278')
 
-prepare() {
-    cd ${pkgbase}-${pkgver}
-}
-
 build() {
     local meson_options=(
         -Drootlibdir=/usr/lib
@@ -47,7 +52,7 @@ check(){
 
 package_elogind() {
     pkgdesc="The systemd project's logind, extracted to a standalone package"
-    provides=("elogind=${pkgver}" "systemd=${pkgver}") # do not provide "systemd-tools=${pkgver}" because openrc will conflict
+    provides=("systemd=${pkgver}")
     depends=('pam' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
     optdepends=('polkit: polkit support')
     backup=('etc/elogind/logind.conf')
@@ -74,9 +79,9 @@ package_elogind() {
 package_libelogind(){
     pkgdesc="elogind client libraries"
     groups=('base-devel')
-    provides=('libelogind.so' "libelogind=${pkgver}"
-            "libsystemd=${pkgver}" "systemd-libs=${pkgver}"
-            'libsystemd.so=0-64')
+    provides=('libelogind.so'
+             "libsystemd=${pkgver}" "systemd-libs=${pkgver}"
+             'libsystemd.so')
     conflicts+=('libsystemd.so')
     depends=('libcap' 'libudev')
 
@@ -85,6 +90,6 @@ package_libelogind(){
     install -dm755 ${pkgdir}/usr/lib
     mv ${srcdir}/_libelogind/libelogind*.so* ${pkgdir}/usr/lib
 
-    ln -sfv libelogind.so ${pkgdir}/usr/lib/libsystemd.so
+    install -m755 ${pkgdir}/usr/lib/libelogind.so ${pkgdir}/usr/lib/libsystemd.so
     ln -sfv libsystemd.so ${pkgdir}/usr/lib/libsystemd.so.0
 }
-- 
cgit v1.2.3