From f427a05fda9bc051ce28b83b81f108866d533e2f Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Fri, 26 Aug 2022 10:28:10 +0000
Subject: community/elogind: rebuild, cleanup

---
 community/elogind/APKBUILD | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/community/elogind/APKBUILD b/community/elogind/APKBUILD
index b6c4082a60a..14140196b37 100644
--- a/community/elogind/APKBUILD
+++ b/community/elogind/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=elogind
 pkgver=246.10
-pkgrel=4
+pkgrel=5
 pkgdesc="Standalone fork of systemd's elogind"
 url="https://github.com/elogind/elogind"
 arch="all"
@@ -10,22 +10,21 @@ license="GPL-2.0-or-later LGPL-2.1-or-later"
 depends="dbus shadow"
 options="!check" # Tests fail on builders
 makedepends="
-	meson
+	acl-dev
 	coreutils
+	dbus-dev
 	docbook-xsl
+	eudev-dev
 	gettext-dev
-	git
+	glib-dev
 	gperf
 	intltool
-	libxslt-dev
-	glib-dev
-	acl-dev
-	eudev-dev
 	libcap-dev
 	libseccomp-dev
+	libxslt-dev
 	linux-pam-dev
 	m4
-	dbus-dev
+	meson
 	pcre2-dev
 	"
 subpackages="
@@ -34,8 +33,8 @@ subpackages="
 	$pkgname-lang
 	$pkgname-openrc
 	lib$pkgname:libs
-	$pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-zsh-completion
+	$pkgname-bash-completion
 	"
 source="https://github.com/elogind/elogind/archive/v$pkgver/elogind-v$pkgver.tar.gz
 	elogind.initd
@@ -44,11 +43,6 @@ source="https://github.com/elogind/elogind/archive/v$pkgver/elogind-v$pkgver.tar
 	"
 
 build() {
-	case "$CARCH" in
-		# polkit is not available on these arches
-		s390x|riscv64) _polkit=false; export CFLAGS="$CFLAGS -D__IGNORE_pkey_mprotect -DSO_PEERSEC=31" ;;
-		*) _polkit=true ;;
-	esac
 	export LDFLAGS="$LDFLAGS -lintl"
 	abuild-meson \
 		-Dcgroup-controller=elogind \
@@ -57,7 +51,7 @@ build() {
 		-Dreboot-path=/sbin/reboot \
 		-Ddefault-hierarchy=hybrid \
 		-Ddefault-kill-user-processes=false \
-		-Dpolkit=$_polkit \
+		-Dpolkit=true \
 		-Dman=true \
 		build
 	meson compile ${JOBS:+-j ${JOBS}} -C build
@@ -83,22 +77,6 @@ package() {
 	install -Dm755 "$srcdir"/elogind.initd "$pkgdir"/etc/init.d/elogind
 }
 
-zshcomp() {
-	pkgdesc="Zsh completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share/
-}
-
-bashcomp() {
-	pkgdesc="Bash completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
-}
-
 sha512sums="
 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b  elogind-v246.10.tar.gz
 e73738488e78af099fdbb7c93a411a3e8d69080a93f89c245cb8c6de5fe4cb7fe724687d19e21eb6be52ccc795ec200d9c6e499efb1afd2b27467f7f541a7dd1  elogind.initd
-- 
cgit v1.2.3