Fix for new user/group stuff. See bug #58526

6 files changed, 40 insertions, 27 deletions

diff --git a/dev-dotnet/xsp/ChangeLog b/dev-dotnet/xsp/ChangeLog
index cbd2ce8d4446..7804690dd906 100644
--- a/dev-dotnet/xsp/ChangeLog
+++ b/dev-dotnet/xsp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/xsp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.10 2004/06/30 15:55:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.11 2004/08/03 02:21:41 latexer Exp $
+
+  02 Aug 2004; Peter Johanson <latexer@gentoo.org> xsp-0.13.ebuild,
+  xsp-0.14.ebuild, xsp-0.15.ebuild, xsp-0.16.ebuild, xsp-1.0.ebuild:
+  Fix for new group/user stuff. See bug #58526.
 
   30 Jun 2004; Peter Johanson <latexer@gentoo.org> xsp-1.0.ebuild:
   Smal dep fix.
diff --git a/dev-dotnet/xsp/xsp-0.13.ebuild b/dev-dotnet/xsp/xsp-0.13.ebuild
index e72661e6a7a2..1d74469671dc 100644
--- a/dev-dotnet/xsp/xsp-0.13.ebuild
+++ b/dev-dotnet/xsp/xsp-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.13.ebuild,v 1.4 2004/06/29 18:06:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.13.ebuild,v 1.5 2004/08/03 02:21:41 latexer Exp $
 
 inherit mono eutils
 
@@ -15,12 +15,14 @@ IUSE=""
 
 DEPEND=">=dev-dotnet/mono-0.91"
 
-src_install() {
+pkg_preinst() {
 	enewgroup aspnet
 
 	# Give aspnet home dir of /tmp since it must create ~/.wapi
 	enewuser aspnet -1 /bin/false /tmp aspnet
+}
 
+src_install() {
 	einstall DESTDIR=${D} || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/xsp.initd xsp
 	insinto /etc/conf.d ; newins ${FILESDIR}/xsp.confd xsp
diff --git a/dev-dotnet/xsp/xsp-0.14.ebuild b/dev-dotnet/xsp/xsp-0.14.ebuild
index d46b5f9e069f..0dbdaa66118f 100644
--- a/dev-dotnet/xsp/xsp-0.14.ebuild
+++ b/dev-dotnet/xsp/xsp-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.14.ebuild,v 1.6 2004/06/29 18:06:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.14.ebuild,v 1.7 2004/08/03 02:21:41 latexer Exp $
 
 inherit mono eutils
 
@@ -15,6 +15,13 @@ IUSE=""
 
 DEPEND=">=dev-dotnet/mono-0.91"
 
+pkg_preinst() {
+	enewgroup aspnet
+
+	# Give aspnet home dir of /tmp since it must create ~/.wapi
+	enewuser aspnet -1 /bin/false /tmp aspnet
+}
+
 src_compile() {
 	econf || die "./configure failed!"
 	emake || {
@@ -25,11 +32,6 @@ src_compile() {
 }
 
 src_install() {
-	enewgroup aspnet
-
-	# Give aspnet home dir of /tmp since it must create ~/.wapi
-	enewuser aspnet -1 /bin/false /tmp aspnet
-
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/xsp.initd xsp
 	insinto /etc/conf.d ; newins ${FILESDIR}/xsp.confd xsp
diff --git a/dev-dotnet/xsp/xsp-0.15.ebuild b/dev-dotnet/xsp/xsp-0.15.ebuild
index e7669bb73637..c5e5c7d1afa1 100644
--- a/dev-dotnet/xsp/xsp-0.15.ebuild
+++ b/dev-dotnet/xsp/xsp-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.15.ebuild,v 1.4 2004/06/29 18:06:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.15.ebuild,v 1.5 2004/08/03 02:21:41 latexer Exp $
 
 inherit mono eutils
 
@@ -15,6 +15,12 @@ IUSE=""
 
 DEPEND=">=dev-dotnet/mono-0.96"
 
+pkg_preinst() {
+	enewgroup aspnet
+
+	# Give aspnet home dir of /tmp since it must create ~/.wapi
+	enewuser aspnet -1 /bin/false /tmp aspnet
+}
 src_compile() {
 	econf || die "./configure failed!"
 	emake || {
@@ -25,11 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	enewgroup aspnet
-
-	# Give aspnet home dir of /tmp since it must create ~/.wapi
-	enewuser aspnet -1 /bin/false /tmp aspnet
-
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/xsp.initd xsp
 	insinto /etc/conf.d ; newins ${FILESDIR}/xsp.confd xsp
diff --git a/dev-dotnet/xsp/xsp-0.16.ebuild b/dev-dotnet/xsp/xsp-0.16.ebuild
index 628504cfac64..48bdda60b562 100644
--- a/dev-dotnet/xsp/xsp-0.16.ebuild
+++ b/dev-dotnet/xsp/xsp-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.16.ebuild,v 1.3 2004/06/29 18:06:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-0.16.ebuild,v 1.4 2004/08/03 02:21:41 latexer Exp $
 
 inherit mono eutils
 
@@ -15,6 +15,13 @@ IUSE=""
 
 DEPEND=">=dev-dotnet/mono-0.97"
 
+pkg_preinst() {
+	enewgroup aspnet
+
+	# Give aspnet home dir of /tmp since it must create ~/.wapi
+	enewuser aspnet -1 /bin/false /tmp aspnet
+}
+
 src_compile() {
 	econf || die "./configure failed!"
 	emake || {
@@ -25,11 +32,6 @@ src_compile() {
 }
 
 src_install() {
-	enewgroup aspnet
-
-	# Give aspnet home dir of /tmp since it must create ~/.wapi
-	enewuser aspnet -1 /bin/false /tmp aspnet
-
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/xsp.initd xsp
 	insinto /etc/conf.d ; newins ${FILESDIR}/xsp.confd xsp
diff --git a/dev-dotnet/xsp/xsp-1.0.ebuild b/dev-dotnet/xsp/xsp-1.0.ebuild
index aa202a6c7ff1..644ce08d3392 100644
--- a/dev-dotnet/xsp/xsp-1.0.ebuild
+++ b/dev-dotnet/xsp/xsp-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-1.0.ebuild,v 1.3 2004/07/14 01:32:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-1.0.ebuild,v 1.4 2004/08/03 02:21:41 latexer Exp $
 
 inherit mono eutils
 
@@ -16,6 +16,13 @@ IUSE=""
 
 DEPEND=">=dev-dotnet/mono-1.0"
 
+pkg_preinst() {
+	enewgroup aspnet
+
+	# Give aspnet home dir of /tmp since it must create ~/.wapi
+	enewuser aspnet -1 /bin/false /tmp aspnet
+}
+
 src_compile() {
 	econf || die "./configure failed!"
 	emake || {
@@ -26,11 +33,6 @@ src_compile() {
 }
 
 src_install() {
-	enewgroup aspnet
-
-	# Give aspnet home dir of /tmp since it must create ~/.wapi
-	enewuser aspnet -1 /bin/false /tmp aspnet
-
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/xsp.initd xsp
 	insinto /etc/conf.d ; newins ${FILESDIR}/xsp.confd xsp