From ee06a5f8b9001ee514c7c4c3f692e069654855f2 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 17 Feb 2019 22:44:17 -0500
Subject: libre-testing/systemd: Rename libsystemd to systemd-libs

---
 libre-testing/systemd/PKGBUILD | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD
index f8fef3595..706106119 100644
--- a/libre-testing/systemd/PKGBUILD
+++ b/libre-testing/systemd/PKGBUILD
@@ -6,16 +6,16 @@
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 
 pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat')
+pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
 pkgname+=('systemd-common' 'systemd-udev')
-# We split Arch's libsystemd into systemd-$X, for the following $X:
-_libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
-pkgname+=("${_libsystemd[@]/#/systemd-}")
+# We split Arch's systemd-libs into systemd-$X, for the following $X:
+_systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
+pkgname+=("${_systemd_libs[@]/#/systemd-}")
 # Can be from either systemd or systemd-stable
 _commit='0430af90ef28a229e51136ad364e1da7e76c8638'
 pkgver=240.95
-pkgrel=1
-pkgrel+=.parabola5
+pkgrel=2
+pkgrel+=.par1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
 url='https://www.github.com/systemd/systemd'
@@ -155,6 +155,9 @@ build() {
   fi
 
   local _meson_options=(
+    # TODO: enable for v241
+    #-Dversion-tag="${pkgver}-${pkgrel}-arch"
+
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
@@ -233,7 +236,7 @@ package_systemd() {
   license=('LGPL2.1')
   groups=('base-devel')
   depends=('bash' 'dbus' 'kbd' 'kmod'
-           'libsystemd' 'pam' 'libelf'
+           'systemd-libs' 'pam' 'libelf'
            'util-linux' 'pcre2')
   depends+=("systemd-common=$pkgver-$pkgrel" 'udev')
   provides=("systemd-tools=$pkgver")
@@ -341,10 +344,13 @@ package_systemd-udev() {
   install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook
 }
 
-package_libsystemd() {
+package_systemd-libs() {
   pkgdesc='systemd client libraries metapackage'
-  depends=("${_libsystemd[@]/libsystemd/libsystemd.so}")
+  depends=("${_systemd_libs[@]/libsystemd/libsystemd.so}")
   license=('LGPL2.1')
+  provides=('libsystemd')
+  conflicts=('libsystemd')
+  replaces=('libsystemd')
 }
 
 package_systemd-libsystemd() {
-- 
cgit v1.2.3