--- /var/portage/net-zope/zope/zope-2.7.1.ebuild	2004-07-13 19:51:28.000000000 -0400
+++ /etc/portage/net-zope/zope/zope-2.7.2_rc1.ebuild	2004-07-14 11:00:28.850552426 -0400
@@ -4,30 +4,30 @@
 
 inherit eutils
 
-SFPV="$(echo ${PV} | sed -e 's/_beta/-b/')"
-SDPV="$(echo ${PV} | sed -e 's/_beta/b/')"
+SFPV="$(echo ${PV} | sed -e 's/_beta/-b/' -e 's/_rc/-RC/')"
+SDPV="$(echo ${PV} | sed -e 's/_beta/b/' -e 's/_rc/RC/')"
 DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
 HOMEPAGE="http://www.zope.org"
-SRC_URI="http://www.zope.org/Products/Zope/${SDPV}/Zope-${SFPV}.tgz"
+SRC_URI="http://www.zope.org/Products/Zope/${SDPV}/Zope-${SFPV}.tar.gz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
 KEYWORDS="~x86 ~sparc ~ppc ~alpha"
 IUSE="unicode"
 
-RDEPEND="=dev-lang/python-2.3.3"
+RDEPEND="=dev-lang/python-2.3*"
 python='python2.3'
 
 DEPEND="${RDEPEND}
 virtual/glibc
 >=sys-apps/sed-4.0.5
->=app-admin/zope-config-0.3"
+>=app-admin/zope-config-0.4"
 
-S="${WORKDIR}/Zope-${SFPV}-0"
+S="${WORKDIR}/Zope-${SFPV}"
 
 ZUID=zope
 ZGID=zope
-ZS_DIR=${ROOT}/usr/share/zope/
+ZS_DIR=${ROOT}/usr/lib/
 ZI_DIR=${ROOT}/var/lib/zope/
 ZSERVDIR=${ZS_DIR}${PF}/
 RCNAME=zope.initd
@@ -62,7 +62,8 @@
 
 pkg_setup() {
 	enewgroup ${ZGID} 261
-	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} zope
+	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
+		enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
 }
 
 src_compile() {