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

--HG--
extra : convert_revision : 8c510305c7159b48330a72db835ce76be43f13cd
---
 srcpkgs/avahi/INSTALL  | 35 -----------------------------------
 srcpkgs/avahi/REMOVE   | 15 ---------------
 srcpkgs/avahi/template |  6 ++++--
 3 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/avahi/INSTALL
 delete mode 100644 srcpkgs/avahi/REMOVE

diff --git a/srcpkgs/avahi/INSTALL b/srcpkgs/avahi/INSTALL
deleted file mode 100644
index dfeb228b579..00000000000
--- a/srcpkgs/avahi/INSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This script creates the avahi and netdev system user/group.
-#
-
-case "${ACTION}" in
-pre)
-	;;
-post)
-	if ! getent group netdev >/dev/null; then
-		groupadd -r netdev 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created netdev system group."
-	fi
-	if ! getent passwd netdev >/dev/null; then
-		useradd -c "Network device user" \
-			-d / -s /sbin/nologin -g netdev -r netdev && \
-			passwd -l netdev 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created netdev system user."
-	fi
-	if ! getent group avahi >/dev/null; then
-		groupadd -r avahi 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created avahi system group."
-	fi
-	if ! getent passwd avahi >/dev/null; then
-		useradd -c "Avahi daemon" \
-			-d / -s /sbin/nologin -g avahi -r avahi && \
-			passwd -l avahi 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created avahi system user."
-	fi
-
-	;;
-esac
diff --git a/srcpkgs/avahi/REMOVE b/srcpkgs/avahi/REMOVE
deleted file mode 100644
index 3f37cf73aea..00000000000
--- a/srcpkgs/avahi/REMOVE
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This script removes the avahi and netdev user/group.
-#
-case "${ACTION}" in
-pre)
-	if [ "$UPDATE" = "no" ]; then
-		userdel avahi &>/dev/null
-		[ $? -eq 0 ] && echo "Removed avahi system user/group."
-		userdel netdev &>/dev/null
-		[ $? -eq 0 ] && echo "Removed netdev system user/group."
-	fi
-	;;
-post)
-	;;
-esac
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index af78cdec3bb..c8d739287e4 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.25
-revision=1
+revision=2
 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -20,6 +20,8 @@ long_desc="
  a network and instantly find printers to print to, files to look at and
  people to talk to."
 
+# Create avahi and netdev system accounts.
+system_accounts="avahi netdev"
 openrc_services="avahi-daemon default avahi-dnsconfd default"
 conf_files="/etc/avahi/avahi-daemon.conf /etc/avahi/hosts.conf"
 
@@ -29,7 +31,7 @@ subpackages="$subpackages $pkgname-libs-devel $pkgname-glib-libs"
 subpackages="$subpackages $pkgname-glib-libs-devel $pkgname-ui-libs"
 subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
-subpackages="$subpackages  $pkgname-python"
+subpackages="$subpackages $pkgname-python"
 
 Add_dependency run glibc
 Add_dependency run dbus