From 5dd3ca454528f48583bde3804f79ceb783b4751e Mon Sep 17 00:00:00 2001
From: Courtney Swagar <distorto@member.fsf.org>
Date: Jun 21 2022 08:03:27 +0000
Subject: updpkg: nonsystemd/openrc 0.45.1-1


---

diff --git a/nonsystemd/openrc/PKGBUILD b/nonsystemd/openrc/PKGBUILD
index eb0b0d2..f5fac4d 100644
--- a/nonsystemd/openrc/PKGBUILD
+++ b/nonsystemd/openrc/PKGBUILD
@@ -9,12 +9,13 @@
 pkgbase=openrc
 pkgname=('openrc' 'openrc-bash-completions' 'openrc-zsh-completions'
          'openrc-init' 'openrc-sysvinit' 'openrc-net')
-pkgver=0.43.3
+pkgver=0.45.1
 pkgrel=1
 pkgdesc="Gentoo's universal init system"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/OpenRC/openrc"
 license=('BSD2')
+makedepends=('psmisc' 'netifrc' 'perl' 'meson')
 source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
         "${pkgbase}.logrotate"
         'openrc-hook'
@@ -23,7 +24,7 @@ source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
         'sysctl.conf'
         '30-binfmt.hook'
         'kmod-static-nodes.initd')
-sha256sums=('968e81743a1de7a2348590b3b3286d6af5baf96da28fa1e6364e24f8203fc3b6'
+sha256sums=('7c0df42e8a543b6c39fc59760a3c6b4983da6724f2cbfce2d7662b0ee3b28def'
             '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
             '7de1e65f48ba31fc015cfb77be167b41aabdf0f20cb6617ecf3f4c3ca434c9e8'
             'a3fda2186e023ae60c0e0d3806ffeb95effe675acea03cdfd0bf30e8f1c188d4'
@@ -32,42 +33,35 @@ sha256sums=('968e81743a1de7a2348590b3b3286d6af5baf96da28fa1e6364e24f8203fc3b6'
             '28aa413fd78bca98bb23294eeb3f49149825a2c2f97a7ee10039385f5e8e50e9'
             '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571')
 
-_args=(
-    BRANDING='Parabola GNU/Linux-libre'
-    SYSCONFDIR=/etc
-    PREFIX=/usr
-    SBINDIR=/usr/bin
-    LIBEXECDIR=/usr/lib/rc
-    MKSELINUX=no
-    MKPAM=pam
-    MKTERMCAP=ncurses
-    MKSYSVINIT=yes
-    MKBASHCOMP=yes
-    MKZSHCOMP=yes
-    MKPKGCONFIG=yes
-)
-
-prepare(){
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    sed -i 's:0444:0644:' mk/sys.mk
-}
-
 check(){
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    make -k check
+    meson test -C build --print-errorlogs
 }
 
 build(){
-    cd "${pkgbase}-${pkgver}"
-    make "${_args[@]}"
+    local meson_options=(
+        -Dbranding="\"Parabola GNU/Linux-libre\""
+        -Dsysconfdir=/etc
+        -Dos=Linux
+        -Drootprefix=/usr
+        -Dpam=true
+        -Dsysvinit=true
+        -Dpkgconfig=true
+        -Dtermcap=ncurses
+        -Dbash-completions=true
+        -Dzsh-completions=true
+        -Dselinux=disabled
+    )
+
+    arch-meson "${pkgbase}-${pkgver}" build "${meson_options[@]}"
+
+    meson compile -C build
 }
 
 package_openrc() {
-    depends=('psmisc' 'pam' 'openrc-pid1')
+    depends=('psmisc' 'pam' 'openrc-pid1' 'inetutils')
     optdepends=('openrc-net: OpenRC ("newnet") network management scripts'
                 'netifrc: Gentoo ("oldnet") network management scripts')
     backup=('etc/rc.conf'
-            'etc/conf.d/agetty'
             'etc/conf.d/bootmisc'
             'etc/conf.d/consolefont'
             'etc/conf.d/devfs'
@@ -88,9 +82,7 @@ package_openrc() {
     conflicts=('kmod-openrc' 'systemd-tools')
     replaces=('kmod-openrc')
 
-    cd "${pkgbase}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" "${_args[@]}" install
+    meson install -C build --destdir="${pkgdir}"
 
     install -Dm644 "${srcdir}/${pkgbase}".logrotate "${pkgdir}"/etc/logrotate.d/"${pkgbase}"
 
@@ -109,33 +101,28 @@ package_openrc() {
         -i ${pkgdir}/etc/conf.d/agetty
 
     # sysctl defaults
-    # upstream (systemd) default configuration can be found on github:
-    # https://raw.githubusercontent.com/systemd/systemd/master/sysctl.d/50-default.conf
     install -m755 "${srcdir}"/sysctl.conf "${pkgdir}"/usr/lib/sysctl.d/50-default.conf
 
+    # license
+    install -Dm644 ${pkgbase}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgbase}"/LICENSE
+
     # pacman hooks
     install -Dm755 "${srcdir}"/openrc-hook "${pkgdir}"/usr/share/libalpm/scripts/openrc-hook
     install -Dm644 -t "${pkgdir}"/usr/share/libalpm/hooks "${srcdir}"/*.hook
 
-    # license
-    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgbase}"/LICENSE
-
-    # split bash completions
-    install -d "${srcdir}"/_bash-completion/usr/share/bash-completion/completions
-    mv -v "${pkgdir}"/usr/share/bash-completion/completions/* "${srcdir}"/_bash-completion/usr/share/bash-completion/completions
-
-    # split zsh completions
-    install -d "${srcdir}"/_zsh/usr/share/zsh/site-functions
-    mv -v "${pkgdir}"/usr/share/zsh/site-functions/* "${srcdir}"/_zsh/usr/share/zsh/site-functions
+    # split bash & zsh completions
+    install -d "${srcdir}"/{_bash,_zsh}
+    mv -v "${pkgdir}"/usr/share/bash-completion "${srcdir}"/_bash
+    mv -v "${pkgdir}"/usr/share/zsh "${srcdir}"/_zsh
 
     # split init
     for file in \
       etc/init.d/agetty.tty{1..6} \
       etc/runlevels/default/agetty.tty{1..6} \
-      {usr,usr/lib/rc}/bin/shutdown \
-      {usr,usr/lib/rc}/bin/reboot \
-      {usr,usr/lib/rc}/bin/halt \
-      {usr,usr/lib/rc}/bin/poweroff \
+      usr/bin/shutdown \
+      usr/bin/reboot \
+      usr/bin/halt \
+      usr/bin/poweroff \
       usr/bin/openrc-{init,shutdown} \
       usr/bin/init \
       usr/share/man/man8/openrc-{init,shutdown}.8
@@ -166,14 +153,16 @@ package_openrc-bash-completions() {
     depends=('openrc' 'bash')
     pkgdesc="OpenRC completions for Bash"
 
-    mv -v "${srcdir}"/_bash-completion/* "${pkgdir}"
+    install -d "${pkgdir}"/usr/share
+    mv -v "${srcdir}"/_bash/* "${pkgdir}"/usr/share
 }
 
 package_openrc-zsh-completions() {
     depends=('openrc' 'zsh')
     pkgdesc="OpenRC completions for ZSH"
 
-    mv -v "${srcdir}"/_zsh/* "${pkgdir}"
+    install -d "${pkgdir}"/usr/share
+    mv -v "${srcdir}"/_zsh/* "${pkgdir}"/usr/share
 }
 
 package_openrc-init() {