Fix enewuser/enewgroup location, bug #130849.

(Portage version: 2.1_pre10-r2)

6 files changed, 30 insertions, 45 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 376c20c518da..2489a812b973 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.69 2006/04/30 13:55:53 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.70 2006/05/05 10:41:19 flameeyes Exp $
+
+  05 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  jabberd-1.4.3-r4.ebuild, jabberd-1.4.3-r5.ebuild, jabberd-2.0.9.ebuild,
+  jabberd-2.0.10.ebuild, jabberd-2.0.11.ebuild:
+  Fix enewuser/enewgroup location, bug #130849.
 
   30 Apr 2006; <reb@gentoo.org> ChangeLog:
   version bump, security bug #126978
diff --git a/net-im/jabberd/jabberd-1.4.3-r4.ebuild b/net-im/jabberd/jabberd-1.4.3-r4.ebuild
index 3f1dca07e09d..fe0ee1470a42 100644
--- a/net-im/jabberd/jabberd-1.4.3-r4.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r4.ebuild,v 1.9 2005/12/31 13:42:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r4.ebuild,v 1.10 2006/05/05 10:41:19 flameeyes Exp $
 
 inherit eutils
 
@@ -28,6 +28,8 @@ PDEPEND="msn? ( net-im/msn-transport )
 		 icq? ( net-im/jit )"
 
 pkg_setup() {
+	enewgroup jabber
+	enewuser jabber -1 -1 /var/spool/jabber jabber
 
 	if use ipv6 ; then
 		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
@@ -102,18 +104,6 @@ src_install() {
 	exeinto /etc/jabber
 	doexe ${FILESDIR}/self-cert.sh
 
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		enewgroup jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		enewuser jabber -1 -1 /var/spool/jabber jabber
-	fi
-
 	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
 
 	fowners jabber:jabber /etc/jabber
diff --git a/net-im/jabberd/jabberd-1.4.3-r5.ebuild b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
index f33742dc1da3..d0e53c2412d6 100644
--- a/net-im/jabberd/jabberd-1.4.3-r5.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.5 2005/11/24 16:50:10 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.6 2006/05/05 10:41:19 flameeyes Exp $
 
 inherit eutils multilib
 
@@ -28,6 +28,8 @@ PDEPEND="msn? ( net-im/msn-transport )
 		 icq? ( net-im/jit )"
 
 pkg_setup() {
+	enewgroup jabber
+	enewuser jabber -1 -1 /var/spool/jabber jabber
 
 	if use ipv6 ; then
 		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
@@ -102,18 +104,6 @@ src_install() {
 	exeinto /etc/jabber
 	doexe ${FILESDIR}/self-cert.sh
 
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		enewgroup jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		enewuser jabber -1 -1 /var/spool/jabber jabber
-	fi
-
 	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
 
 	fowners jabber:jabber /etc/jabber
diff --git a/net-im/jabberd/jabberd-2.0.10.ebuild b/net-im/jabberd/jabberd-2.0.10.ebuild
index 3ec66f3f6548..bb8b65f62457 100644
--- a/net-im/jabberd/jabberd-2.0.10.ebuild
+++ b/net-im/jabberd/jabberd-2.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.10.ebuild,v 1.1 2006/02/01 15:50:31 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.10.ebuild,v 1.2 2006/05/05 10:41:19 flameeyes Exp $
 
 inherit eutils
 
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}
 	dev-lang/perl" # for the /usr/bin/jabberd wrapper script
 
 pkg_setup() {
+	## add user and group
+	enewgroup jabber
+	enewuser jabber -1 -1 /var/jabberd jabber
+
 	if ! use postgres && ! use mysql && ! use berkdb;  then
 		eerror
 		eerror "For this version of jabberd you must have"
@@ -60,10 +64,6 @@ src_install() {
 #	einstall || die "make install failed"
 	make DESTDIR=${D} install || die "make install failed"
 
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 -1 /var/jabberd jabber
-
 	## set binary permissions
 	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
 	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
diff --git a/net-im/jabberd/jabberd-2.0.11.ebuild b/net-im/jabberd/jabberd-2.0.11.ebuild
index 60e49fde759c..2334c829ec63 100644
--- a/net-im/jabberd/jabberd-2.0.11.ebuild
+++ b/net-im/jabberd/jabberd-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.11.ebuild,v 1.1 2006/04/30 13:50:43 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.11.ebuild,v 1.2 2006/05/05 10:41:19 flameeyes Exp $
 
 inherit eutils
 
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}
 	dev-lang/perl" # for the /usr/bin/jabberd wrapper script
 
 pkg_setup() {
+	## add user and group
+	enewgroup jabber
+	enewuser jabber -1 -1 /var/jabberd jabber
+
 	if ! use postgres && ! use mysql && ! use berkdb;  then
 		eerror
 		eerror "For this version of jabberd you must have"
@@ -60,10 +64,6 @@ src_install() {
 #	einstall || die "make install failed"
 	make DESTDIR=${D} install || die "make install failed"
 
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 -1 /var/jabberd jabber
-
 	## set binary permissions
 	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
 	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
diff --git a/net-im/jabberd/jabberd-2.0.9.ebuild b/net-im/jabberd/jabberd-2.0.9.ebuild
index 52c39f4b9175..b4343432a4ee 100644
--- a/net-im/jabberd/jabberd-2.0.9.ebuild
+++ b/net-im/jabberd/jabberd-2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.9.ebuild,v 1.2 2005/08/23 21:53:35 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.9.ebuild,v 1.3 2006/05/05 10:41:19 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}
 	dev-lang/perl" # for the /usr/bin/jabberd wrapper script
 
 pkg_setup() {
+	## add user and group
+	enewgroup jabber
+	enewuser jabber -1 -1 /var/jabberd jabber
+
 	if ! use postgres && ! use mysql && ! use berkdb;  then
 		eerror
 		eerror "For this version of jabberd you must have"
@@ -65,10 +69,6 @@ src_install() {
 #	einstall || die "make install failed"
 	make DESTDIR=${D} install || die "make install failed"
 
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 -1 /var/jabberd jabber
-
 	## set binary permissions
 	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
 	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}