Removed || die after enewuser/enewgroup, bug #237286.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

13 files changed, 74 insertions, 77 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 0c577355bbab..9f0179ca7ab1 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.255 2008/10/28 17:04:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.256 2008/12/19 17:37:01 pva Exp $
+
+  19 Dec 2008; Peter Volkov <pva@gentoo.org> hal-0.5.7.1-r5.ebuild,
+  hal-0.5.9-r1.ebuild, hal-0.5.9.1-r1.ebuild, hal-0.5.9.1-r2.ebuild,
+  hal-0.5.9.1-r3.ebuild, hal-0.5.10.ebuild, hal-0.5.11.ebuild,
+  hal-0.5.11-r1.ebuild, hal-0.5.11-r2.ebuild, hal-0.5.11-r3.ebuild,
+  hal-0.5.11-r4.ebuild:
+  Removed || die after enewuser/enewgroup, bug #237286.
 
   28 Oct 2008; Markus Rothe <corsair@gentoo.org> hal-0.5.11-r4.ebuild:
   Stable on ppc64
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 98b5d5fafb7a..ccd6b211dd2e 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -71,16 +71,16 @@ DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644
 DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad SHA1 32db287e0eff7f4754b89633909daf0f6e957009 SHA256 f28ed6e02df926ef485fff79587856eb0155c747e311d83d1b6b5e3a25b924c2
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
-EBUILD hal-0.5.10.ebuild 8248 RMD160 c56d241e26b5482852dd5aed247ba7ac1b41c583 SHA1 4c923eefc4bbc0198b6f9f70b2270a9cfdb71ab7 SHA256 92d43d08a805e5dc2471aaa50b56f353061d49bcd220e29fb5f62d44d18d8e22
-EBUILD hal-0.5.11-r1.ebuild 9161 RMD160 71a4360e55fb135ceb3e1eabe9f34bee5686eeb8 SHA1 d1e70fd10e68f7dd9fee14a811e6cd5fec207372 SHA256 6d1bf3e3a8b8c3743107194ef8adca619bbccd7eb1fac229038b7f1d51aa5a10
-EBUILD hal-0.5.11-r2.ebuild 9341 RMD160 a920c4d1a417890ceb80ecef244a6c5b74f4541b SHA1 d4f4d712c329df308e8cecceed94ff35edf9a4f5 SHA256 f27f5e464318d84db09a8a1a1ef2bf23e1e6bae8a4407fb7491b94c833ea8b6f
-EBUILD hal-0.5.11-r3.ebuild 9341 RMD160 7f101d1971092a07648a1af991485e9c2b8e11b7 SHA1 cf9956fb333aee813ff95b1b50eb7b980b15fe3c SHA256 b7acd38250e70091a995fd4b24a08273875f2a9ed376167c531ef6a4b3e65e0b
-EBUILD hal-0.5.11-r4.ebuild 9388 RMD160 344732071f76b7fb8a2868e04c65438600cb4a46 SHA1 bd29196770f1de358cf31357c90081c95b8750c7 SHA256 1f396a9e78d2e2fee83bc1d0b5192a1436d28472f5de60712deb9b59c4a8d503
-EBUILD hal-0.5.11.ebuild 9067 RMD160 1cbcf4a96e0e60ca93076650cdad77fe1319e351 SHA1 9bcafee905a2e46659275d997bb100e790546c77 SHA256 0a45c5fc921ab371fe98739fd8dbd39d67a8d79aa475348bc479aebf7876880c
-EBUILD hal-0.5.7.1-r5.ebuild 6071 RMD160 60716b2c7ee1a8975437ce7202693d6afe4f4827 SHA1 a5ff8967f35cd274f0332d31375c40a2dc7b0365 SHA256 2d0ad70486b0daea4427e7fe175d2efe83c6b26eb7a65118383c5b612c4276cf
-EBUILD hal-0.5.9-r1.ebuild 8126 RMD160 5fa699350af9035dc46ce28ae47fbbbf1372d73f SHA1 fbb47635761675592f1dab9366d17aca9078bd42 SHA256 0eed38206886b8b27ec7021c5e098e204c6dcb610b5d38cc46928fc94cc8be1d
-EBUILD hal-0.5.9.1-r1.ebuild 7200 RMD160 825b2e12573f0e164fc95c747f883a4ff8fe407d SHA1 c411dd412d4bea656d36b8b5f337d7153c789e23 SHA256 acb2a201f38e6479155270fbbb2bf1866cc5729b0bac0e0ce1e776e5776959e5
-EBUILD hal-0.5.9.1-r2.ebuild 6876 RMD160 44e9c3c9dec8212f35b1b2bc2c29e0379ccfa2e6 SHA1 985e45b257741dcd5906a9af30cab854fc65fbd7 SHA256 9eda880949eb2ffb864102ec240b594be465cf5a5f26180c393bc3ffb0a89fd2
-EBUILD hal-0.5.9.1-r3.ebuild 6866 RMD160 74d77db8e6d4909a01ce886238ff3ea1c38790cb SHA1 830da9dbe53cadeccf4cf53766e39f19fc9f3801 SHA256 0bf9e0b12000ffab6bf9541c140eabfbd22942652bcf1dbf50edcfdd7ff703dc
-MISC ChangeLog 40814 RMD160 f5ad172bc3e3cea7ea686b903710da17f3f2f71b SHA1 75def6b8d16590412a391a514a8ed0da187e6be0 SHA256 43bc7b990a8ac1092caada29d62b5372ee8e6ba8556830d2970f4648c505db9c
+EBUILD hal-0.5.10.ebuild 8078 RMD160 89062adfa076c03580d63ca289ba397571ce864d SHA1 99ac31f5b6577dabd9bbd12a946943af74e91587 SHA256 96d15e1c6086164833df0cfbd25a3e79677c801f2c668ff6a1ac653964f9bd58
+EBUILD hal-0.5.11-r1.ebuild 9001 RMD160 e9c63d3736cf114528991e4c15ae8bd691ec223a SHA1 12d517923047fe7011b2ddec1854bcc2772f88ce SHA256 369abd57ac1dcfeced581ac3bc17e2e88296e5e9518d72f746f4b9a658d45266
+EBUILD hal-0.5.11-r2.ebuild 9181 RMD160 81ed5c10abc59fe6dae49057e05270028398b0ca SHA1 ea20f9cbb292f629e453e324b788a1ec9cd136b4 SHA256 e4ea2dca3f423dc1e6e350350ac2b44a7c0e53fcf146c89c6271b177610a5d36
+EBUILD hal-0.5.11-r3.ebuild 9181 RMD160 190c952d43f38efdbfc16b23cbd29ea5e14dccaa SHA1 551c3ca04f9dad747fd8e0ac02e9422f174ee46f SHA256 ca1b6a0086e2202e223ee3de5adf24a460a8622cf45bc323de263edbbd6268f5
+EBUILD hal-0.5.11-r4.ebuild 9227 RMD160 e0e78fb6a22ffe1c39dab9bf464f3729082834aa SHA1 b5719d710dd0c7c37dd56c9df86c38c3df5154f8 SHA256 fd6fcaaf5724fd48883e10d354834839f339fb93093c5832cb54d62f6f71d5a7
+EBUILD hal-0.5.11.ebuild 8904 RMD160 255fc6159c1f05d0db3ce104852a7449fae75f6e SHA1 c9f996fdf8c7a0ff8da03808fd7edaed40a25a6f SHA256 9fb22e5d5fc8a74e8e63a6cb06fc5a270be4e12bfa825f7524beaffaac7a6c9a
+EBUILD hal-0.5.7.1-r5.ebuild 5949 RMD160 3e3de84c3ac4676da8fd588e2d58b7ba943c682c SHA1 39d62645fd278d08e47628b32462ee02eb6c00b7 SHA256 b92d8ecb4b07428dc14988fae6c30372e9feac64f1c9dbc65ffa9fc0982d6012
+EBUILD hal-0.5.9-r1.ebuild 7954 RMD160 3192a7977b48c0e9d1810ce0e3bfdbbb77baf74a SHA1 7d3aa2946146730a8bc9e88e66816623e2a23452 SHA256 8e34ca0d4779f910f56c994f479ee50835006f15198157e0fe0080c822573fe2
+EBUILD hal-0.5.9.1-r1.ebuild 7028 RMD160 026cdc11e94531e74ac3297ea55102ce0c727b78 SHA1 ca452ee26ce9604b3803a14ba531d45fe6ef8ed2 SHA256 aa19c41ae0f9ddb7044ad6313479ae6d5d52b02176bffa287214d58d8bd10758
+EBUILD hal-0.5.9.1-r2.ebuild 6704 RMD160 d94dc27787f001b71a46e375c622df17fbb166ec SHA1 60389e086d054b3189eb052277ad1ae676032261 SHA256 71d193a6ba2dc82ea0cadcf5a6911f89e6eeebcb467aa60aba857e0dd6c53cfe
+EBUILD hal-0.5.9.1-r3.ebuild 6694 RMD160 91f751aa5525c0879cf23bcbb95a9fb343742d0f SHA1 a0b0da643a6c7dab8f0517e01bae4d774224b15a SHA256 09338520c2c1278f1fec32c0c8e9fa95ac906d35eefe52f1f4e1507b12953452
+MISC ChangeLog 41159 RMD160 b9c330f2227717228f163f9d4533b019311b25c8 SHA1 a53390de337c050d26cb8e7110ab068a48fc40a3 SHA256 4aaf5f2dc031b23709d40fc5f47fbdfff1860b3da0d36bb1c669c36ca6e00bad
 MISC metadata.xml 2118 RMD160 c5e854ace21eaef57ae132e7dd9fe6bbcd644214 SHA1 c936358b6965f4f59c408fdaeed2d5ec22e66144 SHA256 c0eeaa1b4b92601ee0e46deafddaad311af80bc4a0111124fabdb0380386c39a
diff --git a/sys-apps/hal/hal-0.5.10.ebuild b/sys-apps/hal/hal-0.5.10.ebuild
index 26cf3a93e131..9e9feb5da2ae 100644
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ b/sys-apps/hal/hal-0.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.17 2008/06/01 10:57:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.18 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -100,17 +100,15 @@ pkg_setup() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=191605
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.11-r1.ebuild b/sys-apps/hal/hal-0.5.11-r1.ebuild
index 04352ea878cf..2f0cabc89461 100644
--- a/sys-apps/hal/hal-0.5.11-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.10 2008/10/18 14:32:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.11 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -95,15 +95,15 @@ pkg_setup() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=191605
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} || die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} || die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.11-r2.ebuild b/sys-apps/hal/hal-0.5.11-r2.ebuild
index b9dfa96d99fe..5e104386c1ee 100644
--- a/sys-apps/hal/hal-0.5.11-r2.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.4 2008/09/21 12:54:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.5 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -95,15 +95,15 @@ pkg_setup() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=191605
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} || die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} || die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.11-r3.ebuild b/sys-apps/hal/hal-0.5.11-r3.ebuild
index c02eb70aa1e1..f353f19d4c5c 100644
--- a/sys-apps/hal/hal-0.5.11-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r3.ebuild,v 1.2 2008/09/21 12:54:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r3.ebuild,v 1.3 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -95,15 +95,15 @@ pkg_setup() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=191605
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} || die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} || die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.11-r4.ebuild b/sys-apps/hal/hal-0.5.11-r4.ebuild
index 4f7cca0d73a3..958e2cf3673f 100644
--- a/sys-apps/hal/hal-0.5.11-r4.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.2 2008/10/28 17:04:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.3 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -95,15 +95,15 @@ pkg_setup() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=191605
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} || die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} || die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.11.ebuild b/sys-apps/hal/hal-0.5.11.ebuild
index 5f13e3a421c9..a13b00695372 100644
--- a/sys-apps/hal/hal-0.5.11.ebuild
+++ b/sys-apps/hal/hal-0.5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11.ebuild,v 1.6 2008/08/17 05:03:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11.ebuild,v 1.7 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -95,15 +95,15 @@ pkg_setup() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=191605
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} || die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} || die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.7.1-r5.ebuild b/sys-apps/hal/hal-0.5.7.1-r5.ebuild
index 28c4fa978517..d955a9989c27 100644
--- a/sys-apps/hal/hal-0.5.7.1-r5.ebuild
+++ b/sys-apps/hal/hal-0.5.7.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r5.ebuild,v 1.20 2008/05/20 04:30:38 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r5.ebuild,v 1.21 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info
 
@@ -182,12 +182,12 @@ pkg_postinst() {
 	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
-	enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS} || die "Problem adding haldaemon user"
+	enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS}
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
 	# If users have a problem with this, let them file a bug
diff --git a/sys-apps/hal/hal-0.5.9-r1.ebuild b/sys-apps/hal/hal-0.5.9-r1.ebuild
index 452a6ea3f2b2..ff4d4409862c 100644
--- a/sys-apps/hal/hal-0.5.9-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9-r1.ebuild,v 1.22 2008/05/20 04:30:38 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9-r1.ebuild,v 1.23 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -219,17 +219,15 @@ pkg_postinst() {
 	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
index afa2f2e55a09..d1767e5ab2e3 100644
--- a/sys-apps/hal/hal-0.5.9.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.14 2008/05/20 04:30:38 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.15 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -203,17 +203,15 @@ pkg_postinst() {
 	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.9.1-r2.ebuild b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
index f4fce0db9fa3..4ed7b01b15d4 100644
--- a/sys-apps/hal/hal-0.5.9.1-r2.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r2.ebuild,v 1.7 2008/05/20 04:30:38 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r2.ebuild,v 1.8 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -198,17 +198,15 @@ pkg_postinst() {
 	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
diff --git a/sys-apps/hal/hal-0.5.9.1-r3.ebuild b/sys-apps/hal/hal-0.5.9.1-r3.ebuild
index 760a1c262913..540f0db8aa18 100644
--- a/sys-apps/hal/hal-0.5.9.1-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r3.ebuild,v 1.11 2008/05/20 04:30:38 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r3.ebuild,v 1.12 2008/12/19 17:37:01 pva Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -198,17 +198,15 @@ pkg_postinst() {
 	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
 
 	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
+	enewgroup haldaemon
+	enewgroup plugdev
 
 	# HAL drops priviledges by default now ...
 	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
 	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
 	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
 	fi
 
 	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}