--- /usr/portage/net-zope/zope/zope-2.7.2.ebuild	2004-08-01 15:35:49.000000000 -0700
+++ /usr/local/portage/net-zope/zope/zope-2.7.2.ebuild	2004-08-10 21:54:30.129167112 -0700
@@ -10,7 +10,7 @@
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~amd64"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
@@ -26,10 +26,10 @@
 ZUID=zope
 ZGID=zope
 ZGID_INST="$(echo ${PN}-${PV} | sed -e 's/\./_/g' )"
-ZS_DIR=${ROOT}/usr/lib/
-ZI_DIR=${ROOT}/var/lib/zope/
+ZS_DIR=${ROOT%/}/usr/lib/
+ZI_DIR=${ROOT%/}/var/lib/zope/
 ZSERVDIR=${ZS_DIR}${PN}-${PV}/
-ZINSTDIR=${ZI_DIR}${PN}-${PV}
+ZINSTDIR=${ZI_DIR}${PN}-${PV}/
 
 RCNAME=zope.initd
 
@@ -44,7 +44,6 @@
 # Parameters:
 #  $1 = instance directory
 #  $2 = group
-
 setup_security() {
 	# The old version made everything owned by zope:${DEFAULT_INSTANCE_GID},
 	# and group-writable. This is like making everything in net-www/apache2 
@@ -53,6 +52,7 @@
 	# by the zope group, of which the zope user is a member, so that running
 	# zope instances will be able to read everything.
 	# -- Andy Dustman
+
 	chown -R root:${2} ${1}
 	chmod -R g+r,g-w,o-rwx ${1}
 }
@@ -62,11 +62,11 @@
 	if [ -d ${ZINSTDIR} ] ; then
 		die "Default instance directory (${ZINSTDIR} already exists!"
 	fi
-	if [ -f ${ZI_DIR}/.default ] ; then
-		def_instance=`cat ${ZI_DIR}/.default`
-		die "Default instance file (${ZI_DIR}/.default already exists -> $def_instance"
+	if [ -f ${ZI_DIR}.default ] ; then
+		def_instance=`cat ${ZI_DIR}.default`
+		die "Default instance file (${ZI_DIR}.default already exists -> $def_instance"
 	fi
-	einfo "Creting default zope instance at ${ZINSTDIR} with command:"
+	einfo "Creating default zope instance at ${ZINSTDIR} with command:"
 	einfo "/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} --zgid=${ZGID_INST} --zinituser"
 	ewarn "Default admin user created with password admin. Please change it."
 	/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} --zgid=${ZGID_INST} --zinituser
@@ -77,6 +77,9 @@
 	enewgroup ${ZGID} 261
 	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
 	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
+
+        #[cs] Moved setup_security here to fix Bug #59217
+        setup_security ${D}${ZSERVDIR} ${ZGID}
 }
 
 src_unpack() {
@@ -87,6 +90,7 @@
 }
 
 src_compile() {
+        #[cs] TODO: ZOPE_DIR should be something else....
 	./configure --ignore-largefile --prefix=${ZOPE_DIR} || die "Failed to configure."
 	emake || die "Failed to compile."
 }
@@ -119,15 +123,13 @@
 		cd ${S}
 	fi
 
-	make install PREFIX=${D}/${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
-	dosym ${DOCDESTTREE} ${D}${ZSERVDIR}/doc
+	make install PREFIX=${D}${ZSERVDIR}
+	rm -rf ${D}${ZSERVDIR}doc
+	dosym ${DOCDESTTREE} ${D}${ZSERVDIR}doc
 
-	skel=${D}${ZSERVDIR}/skel
+	skel=${D}${ZSERVDIR}skel
 	dodir /etc/init.d
 	cp ${FILESDIR}/${PV}/zope.initd ${skel}/zope.initd
-
-	setup_security ${D}${ZSERVDIR} ${ZGID}
 }
 
 pkg_postinst() {
@@ -142,8 +144,15 @@
 
 	# Delete .default if this ebuild is the default. zprod-manager will
 	# have to handle a missing default;
-	# TODO: this should be checked
+        # TODO: this should be checked
 	rm -f ${ZI_DIR}/.default
+
+        # TODO: Verify this is right.
+        #if [ -e ${ZI_DIR}.default ]; then
+        #        if [ "$(cat ${ZI_DIR}.default)" = "${PN}-${PV}" ]; then
+        #        	rm -f ${ZI_DIR}.default
+        #        fi
+        #fi
 }
 
 pkg_config() {