libre/systemd: Rename the libsystemd split packages to systemd-$X

So libsystemd-standalone becomes systemd-libsystemd.

1 files changed, 40 insertions, 16 deletions

diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 694073c69..e3fd3b2f3 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat')
-# We split Arch's libsystemd into the following:
-_libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
-pkgname+=("${_libsystemd[@]}")
+# We split Arch's libsystemd into the systemd-$X, for the following $X:
+_libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
+pkgname+=("${_libsystemd[@]/#/systemd-}")
 # Can be from either systemd or systemd-stable
 _commit='de7436b02badc82200dc127ff190b8155769b8e7'
 pkgver=239.0
@@ -280,58 +280,82 @@ package_systemd() {
 
 package_libsystemd() {
   pkgdesc='systemd client libraries metapackage'
-  depends=("${_libsystemd[@]}")
+  depends=("${_libsystemd[@]/#/systemd-}")
   license=('GPL2')
 }
 
-package_libsystemd-standalone() {
+package_systemd-libsystemd() {
   pkgdesc='systemd client library'
   depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
   license=('GPL2')
   provides=('libsystemd.so')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/libsystemd" "$pkgdir"
+  provides+=("libsystemd-standalone=$pkgver")
+  conflicts+=('libsystemd-standalone')
+  replaces+=('libsystemd-standalone')
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_libudev() {
+package_systemd-libudev() {
   pkgdesc='systemd library for enumerating and introspecting local devices'
   depends=('glibc' 'libcap')
   license=('GPL2')
   provides=('libudev.so')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-systemd() {
+package_systemd-nss-systemd() {
   pkgdesc='NSS module providing user and group resolution for dynamic users and groups'
   depends=('glibc' 'libcap')
   license=('GPL2')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-myhostname() {
+package_systemd-nss-myhostname() {
   pkgdesc='NSS module providing hostname resolution for the locally configured system hostname'
   depends=('glibc' 'libcap')
   license=('GPL2')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-mymachines() {
+package_systemd-nss-mymachines() {
   pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances'
   depends=('glibc' 'libcap')
   license=('GPL2')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-resolve() {
+package_systemd-nss-resolve() {
   pkgdesc='NSS module providing hostname resolution via systemd-resolved'
   depends=('glibc' 'libcap')
   license=('GPL2')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
 package_systemd-resolvconf() {