fixed #58526

5 files changed, 21 insertions, 14 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 5788800b62d7..39a8184eb0b4 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.37 2004/07/25 10:35:37 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.38 2004/07/27 16:02:41 batlogg Exp $
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.6.4-r1.ebuild,
+  zope-2.7.1.ebuild, zope-2.7.2.ebuild:
+  fixed #58526, QA issues with enew inside pkg_setup
 
   25 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.2.ebuild:
   readding ZS_DIR and ZI_DIR
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 66fd5f928086..0f1625ee195a 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,7 +1,7 @@
-MD5 215ada2634f3bf4275d0d7af2833917f zope-2.7.1.ebuild 3859
-MD5 bcec2bd98c266278f7bede32289eb201 zope-2.6.4-r1.ebuild 5336
-MD5 261c90f63b6eb593657a4f3b988dcd0d zope-2.7.2.ebuild 4644
-MD5 fd5cee16c30dd276f08b99b831af27d3 ChangeLog 7168
+MD5 05451aa19ac4681fd16a5a480f1c7ea5 zope-2.7.1.ebuild 3860
+MD5 ee4ff08da11eb9f39b9a0b4d95906488 zope-2.6.4-r1.ebuild 5358
+MD5 384a080c7057cf3d7876fdbfa9c528d1 zope-2.7.2.ebuild 4646
+MD5 7c5c9d8a0130206e256baf1e512c36fc ChangeLog 7335
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
 MD5 ae93e53addb8b829a0c097a3b3d9ddf4 files/digest-zope-2.7.1 60
diff --git a/net-zope/zope/zope-2.6.4-r1.ebuild b/net-zope/zope/zope-2.6.4-r1.ebuild
index 7163f121b9c9..90561381ff2f 100644
--- a/net-zope/zope/zope-2.6.4-r1.ebuild
+++ b/net-zope/zope/zope-2.6.4-r1.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/net-zope/zope/zope-2.6.4-r1.ebuild,v 1.9 2004/07/20 01:06:14 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.4-r1.ebuild,v 1.10 2004/07/27 16:02:41 batlogg Exp $
 
 inherit eutils
 
@@ -75,6 +75,11 @@ install_help() {
 		einfo "\t/etc/init.d/${ZGID} start"
 }
 
+pkg_preinst() {
+	enewgroup ${ZGID}
+	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
+}
+
 pkg_setup() {
 	if [ "${PYTHON_SLOT_VERSION}" != '' ] ; then
 		ewarn "WARNING: You set PYTHON_SLOT_VERSION=${PYTHON_SLOT_VERSION}."
@@ -87,8 +92,6 @@ pkg_setup() {
 					ewarn "with this version of zope. Emerge at your own risk."
 					sleep 12
 	fi
-	enewgroup ${ZGID}
-	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
 }
 
 src_compile() {
diff --git a/net-zope/zope/zope-2.7.1.ebuild b/net-zope/zope/zope-2.7.1.ebuild
index 5388941377b1..c1b3b668b0a3 100644
--- a/net-zope/zope/zope-2.7.1.ebuild
+++ b/net-zope/zope/zope-2.7.1.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/net-zope/zope/zope-2.7.1.ebuild,v 1.2 2004/07/14 23:25:55 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.1.ebuild,v 1.3 2004/07/27 16:02:41 batlogg Exp $
 
 inherit eutils
 
@@ -60,9 +60,9 @@ install_help() {
 	einfo "Run zope-config to set up an instance before trying to start zope."
 }
 
-pkg_setup() {
-	enewgroup ${ZGID} 261
-	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} zope
+pkg_preinst() {
+	enewgroup ${ZGID}
+	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
 }
 
 src_compile() {
diff --git a/net-zope/zope/zope-2.7.2.ebuild b/net-zope/zope/zope-2.7.2.ebuild
index 8f729f15ece9..7d1972238a53 100644
--- a/net-zope/zope/zope-2.7.2.ebuild
+++ b/net-zope/zope/zope-2.7.2.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/net-zope/zope/zope-2.7.2.ebuild,v 1.2 2004/07/25 10:35:37 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.2.ebuild,v 1.3 2004/07/27 16:02:41 batlogg Exp $
 
 inherit eutils
 
@@ -73,7 +73,7 @@ install_instance() {
 	einfo "You can also enable autostart on reboot using: rc-update -a ${ZGID_INST} default"
 }
 
-pkg_setup() {
+pkg_preinst() {
 	enewgroup ${ZGID} 261
 	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
 	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}