From 0092bfdf055a7c32cb5ecb9cd3852917d86d7839 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 11 Dec 2009 12:07:07 +0100
Subject: [PATCH] hal: use trigger to (un)register system user/groups, bumprev.

--HG--
extra : convert_revision : 6a8a4206a3a2b1d2d389d1c25a276f546109094d
---
 srcpkgs/hal/INSTALL  | 17 +----------------
 srcpkgs/hal/REMOVE   | 13 -------------
 srcpkgs/hal/template |  6 +++++-
 3 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/hal/REMOVE

diff --git a/srcpkgs/hal/INSTALL b/srcpkgs/hal/INSTALL
index 48fd9d42e90..7da813d4787 100644
--- a/srcpkgs/hal/INSTALL
+++ b/srcpkgs/hal/INSTALL
@@ -1,26 +1,11 @@
 #
-# This script creates the HAL system user/group.
+# This script creates some required dirs.
 #
 
 case "${ACTION}" in
 pre)
 	;;
 post)
-	echo "Running ${PKGNAME}-${VERSION} post installation hooks..."
-	if ! getent group hal >/dev/null; then
-		groupadd -r hal 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created HAL system group."
-	fi
-	if ! getent passwd hal >/dev/null; then
-		useradd -c "HAL daemon" \
-			-d / -s /sbin/nologin -g hal \
-			-G optical,floppy,storage -r hal && \
-		passwd -l hal 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created HAL system user."
-	fi
-
 	# Create some required dirs if don't exist.
 	if [ ! -d var/run/hald ]; then
 		mkdir -p var/run/hald
diff --git a/srcpkgs/hal/REMOVE b/srcpkgs/hal/REMOVE
deleted file mode 100644
index 7df93c1891f..00000000000
--- a/srcpkgs/hal/REMOVE
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This script removes the HAL user/group.
-#
-case "${ACTION}" in
-pre)
-	if [ "$UPDATE" = "no" ]; then
-		userdel hal &>/dev/null
-		[ $? -eq 0 ] && echo "Removed hal system user/group."
-	fi
-	;;
-post)
-	;;
-esac
diff --git a/srcpkgs/hal/template b/srcpkgs/hal/template
index fee3901e62e..00a26d11f47 100644
--- a/srcpkgs/hal/template
+++ b/srcpkgs/hal/template
@@ -1,7 +1,7 @@
 # Template file for 'hal'
 pkgname=hal
 version=0.5.13
-revision=3
+revision=4
 distfiles="http://hal.freedesktop.org/releases/hal-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-static=no --disable-console-kit
@@ -21,6 +21,10 @@ conf_files="/etc/dbus-1/system.d/hal.conf
  /etc/hal/fdi/policy/10-keymap.fdi"
 openrc_services="hal default"
 
+# Create hal system account.
+system_accounts="hal"
+hal_groups="optical,floppy,storage"
+
 Add_dependency full glibc
 Add_dependency full udev
 Add_dependency full dbus