bump

16 files changed, 34 insertions, 809 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index d8c4cd69cd7b..599c5f1839e0 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.6 2003/10/10 21:02:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.7 2003/10/30 14:58:06 lanius Exp $
 
 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 
+*zope-2.6.2 (30 Oct 2003)
+
+  30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> zope-2.6.0-r1.ebuild,
+  zope-2.6.0-r2.ebuild, zope-2.6.0-r3.ebuild, zope-2.6.0.ebuild,
+  zope-2.6.2.ebuild:
+  version bump, cleanups (enewuser, enewgroup), bug #32073
+
   10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> zope-2.4.0-r6.ebuild,
   zope-2.5.1.ebuild:
   fix bug #28165 - $A setting in ebuilds
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 475d214ea125..cbba76355944 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,8 +1,8 @@
 MD5 c3ebe912b17a673e13d5e3060922deee zope-2.4.0-r6.ebuild 2654
-MD5 a4ad78525de5bd589af624ee1c4003d5 zope-2.6.2.ebuild 4179
+MD5 e950559e4827e9a8bc9b0fc13b22d7ba zope-2.6.2.ebuild 3970
 MD5 4509cbc844e892ebbee71d651cb49f27 zope-2.5.1.ebuild 2618
 MD5 222c7b7ea3d77a668e9bfa391339897e zope-2.6.1.ebuild 4178
-MD5 a258c715a0adee57f10cba0b38515275 ChangeLog 2921
+MD5 4587432c005efbe3148b27e27219e22c ChangeLog 3166
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 f8fdebc428a825403b6ecdd86d8454e1 files/zope 5574
 MD5 111f2aacb074731c923a5eb93a53f6af files/zctl.py 9455
diff --git a/net-zope/zope/files/2.6.0/DateTime.py.bz2 b/net-zope/zope/files/2.6.0/DateTime.py.bz2
deleted file mode 100644
index e6f8331421d1..000000000000
--- a/net-zope/zope/files/2.6.0/DateTime.py.bz2
+++ /dev/null
diff --git a/net-zope/zope/files/2.6.0/zope-r1.initd b/net-zope/zope/files/2.6.0/zope-r1.initd
deleted file mode 100644
index b04abd120a03..000000000000
--- a/net-zope/zope/files/2.6.0/zope-r1.initd
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/sbin/runscript 
-# Zope rc-script for Gentoo Linux
-# Copyright 2002-2003 by Jason Shoemaker
-# Distributed under the terms of the GNU General Public License, v2 or later.
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.6.0/zope-r1.initd,v 1.1 2003/03/03 23:43:22 kutsuya Exp $
-
-depend() 
-{
-    need net
-}
-
-# Since zope doesn't delete its .pid file when done, we have to determine its 
-# status. Zope can be shutdown from a browser...this bypasses init.d. 
-
-# Need to export these conf.d variables so that (env) can use them
-
-setup_exports()
-{
-local EXPORT_LST="INSTANCE_HOME SOFTWARE_HOME ZOPE_HOME FORCE_PRODUCT_LOAD \
-PROFILE_PUBLISHER SUPPRESS_ACCESSRULE SUPPRESS_SITEROOT CLIENT_HOME \
-ZEO_CLIENT EVENT_LOG_FORMAT EVENT_LOG_FILE EVENT_LOG_SEVERITY ZSYSLOG \
-ZSYSLOG_FACILITY ZSYSLOG_SERVER ZSYSLOG_ACCESS ZSYSLOG_ACCESS_FACILITY \
-ZSYSLOG_ACCESS_SERVER Z_DEBUG_MODE Z_REALM NO_SECURITY ZOPE_SECURITY_POLICY \
-ZSP_OWNEROUS_SKIP ZSP_AUTHENTICATED_SKIP DISALLOW_LOCAL_PRODUCTS \
-ZOPE_DATABASE_QUOTA ZOPE_READ_ONLY ZSESSION_ADD_NOTIFY ZSESSION_DEL_NOTIFY \
-ZSESSION_TIMEOUT_MINS ZSESSION_OBJECT_LIMIT WEBDAV_SOURCE_PORT_CLIENTS \
-STX_DEFAULT_LEVEL ZOPE_DTML_REQUEST_AUTOQUOTE Z_MAX_STACK_SIZE \
-FORCE_PRODUCT_RELOAD"
-
-for N in $EXPORT_LST ; do
-    if [ -n "${N}" ] ; then export ${N} ; fi
-done
-}
-
-# Check if the file exist. then send file to stdout.
-# Parameters:
-#    $1 = /path/to/pid.file
-# Outputs:
-
-read_pid()
-{
-    if [ -f "${1}" ] ; then
-	cat ${1}
-    fi
-}
-
-# Check if we have a living PID, if not delete the PID FILE
-# Parameters:
-#    $1 = /path/to/pid.file
-# Returns:
-#    0 if alive pid file remains
-#    1 if dead pid file removed
-#    2 if no pid file found
-
-
-check_pid_status()
-{
-    local RESULT=2   # assume no pid file will be found
-    local PID=$(read_pid ${1})
-
-    if [ -n "${PID}" ] ; then
-	ps --no-headers ${PID} > /dev/null 2>&1
-	if [ "${?}" -eq 0 ] ; then
-	    RESULT=0
-	else
-	    rm -f ${1} 
-	    RESULT=1
-	fi
-    fi
-
-    return ${RESULT}
-}
-
-# Parameters: 
-#    None
-# Returns:
-#    0 true 
-#    1 false and echos /pathname/to/pid/file
-
-is_zope_dead()
-{
-    local RESULT=
-
-    if [ -n "${INSTANCE_HOME}" ] ; then
-	loc=${INSTANCE_HOME}
-    else
-	loc=${ZOPE_HOME}
-    fi
-
-    check_pid_status ${loc}/var/Z2.pid
-    RESULT=${?}
-    if [ "${RESULT}" -eq 0 ] ; then 
-	echo "${loc}"
-	RESULT=10
-	break    # found a live pid
-    fi
-
-    if [ "${RESULT}" -eq 10 ] ; then
-	RESULT=1
-    else
-	RESULT=0
-    fi
-
-    return ${RESULT}
-}
-
-status()
-{ 
-
-    if is_zope_dead ; then
-	eerror "--> Zope is dead."
-    else
-	einfo "--> Zope is alive."
-    fi
-
-    return ! is_zope_dead
-}
-
-# If Zope is dead, remove PID file and start zope.
-# The idea with 'env' is that a environment snapshot
-# (current vars + /etc/conf.d/zope?) is created for zope to use.
-
-start_zope()
-{
-    local RESULT=
-
-    is_zope_dead >/dev/null
-    RESULT=${?}
-    if [ "${RESULT}" -eq 0 ] ; then
-	setup_exports
-	umask 077    # Recommended by Zope
-	env /usr/bin/python2.1 ${ZOPE_HOME}z2.py ${ZOPE_OPTS} &         
-	RESULT=${?}
-    else
-	echo 'Zope is running independant of RC management.'
-	echo 'We are going to try and  kill it.'
-	stop_zope
-	if [ "${?}" -eq 0 ] ; then
-	    echo 'Successfully killed zope. Try to start zope again'
-	fi
-    fi
-
-    return ${RESULT}
-}
-
-# If Zope is alive, kill it.
-
-stop_zope()
-{
-    local PID=$(is_zope_dead)
-
-    if [ -n "${PID}" ] ; then
-	kill $(cat ${PID}/var/Z2.pid)    # Not sure if kill always succeeds, so not removeing .pid file.
-    fi
-    return $?
-}
-
-# 
-
-start()
-{
-    ebegin "Starting zope"
-    start_zope
-    eend $? "Failed to start zope"
-}
-
-#
-
-stop()
-{
-    ebegin "Stopping zope"
-    stop_zope
-    eend $? "Failed to stop zope"
-}
diff --git a/net-zope/zope/files/2.6.0/zope-r2.initd b/net-zope/zope/files/2.6.0/zope-r2.initd
deleted file mode 100644
index d35ed1a4b300..000000000000
--- a/net-zope/zope/files/2.6.0/zope-r2.initd
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/sbin/runscript 
-# Zope rc-script for Gentoo Linux
-# Copyright 2002-2003 by Jason Shoemaker
-# Distributed under the terms of the GNU General Public License, v2 or later.
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.6.0/zope-r2.initd,v 1.1 2003/03/03 23:43:22 kutsuya Exp $
-
-python=
-
-depend() 
-{
-    need net
-}
-
-# Since zope doesn't delete its .pid file when done, we have to determine its 
-# status. Zope can be shutdown from a browser...this bypasses init.d. 
-
-# Need to export these conf.d variables so that (env) can use them
-
-setup_exports()
-{
-local EXPORT_LST="INSTANCE_HOME SOFTWARE_HOME ZOPE_HOME FORCE_PRODUCT_LOAD \
-PROFILE_PUBLISHER SUPPRESS_ACCESSRULE SUPPRESS_SITEROOT CLIENT_HOME \
-ZEO_CLIENT EVENT_LOG_FORMAT EVENT_LOG_FILE EVENT_LOG_SEVERITY ZSYSLOG \
-ZSYSLOG_FACILITY ZSYSLOG_SERVER ZSYSLOG_ACCESS ZSYSLOG_ACCESS_FACILITY \
-ZSYSLOG_ACCESS_SERVER Z_DEBUG_MODE Z_REALM NO_SECURITY ZOPE_SECURITY_POLICY \
-ZSP_OWNEROUS_SKIP ZSP_AUTHENTICATED_SKIP DISALLOW_LOCAL_PRODUCTS \
-ZOPE_DATABASE_QUOTA ZOPE_READ_ONLY ZSESSION_ADD_NOTIFY ZSESSION_DEL_NOTIFY \
-ZSESSION_TIMEOUT_MINS ZSESSION_OBJECT_LIMIT WEBDAV_SOURCE_PORT_CLIENTS \
-STX_DEFAULT_LEVEL ZOPE_DTML_REQUEST_AUTOQUOTE Z_MAX_STACK_SIZE \
-FORCE_PRODUCT_RELOAD"
-
-for N in $EXPORT_LST ; do
-    if [ -n "${N}" ] ; then export ${N} ; fi
-done
-}
-
-# Check if the file exist. then send file to stdout.
-# Parameters:
-#    $1 = /path/to/pid.file
-# Outputs:
-
-read_pid()
-{
-    if [ -f "${1}" ] ; then
-	cat ${1}
-    fi
-}
-
-# Check if we have a living PID, if not delete the PID FILE
-# Parameters:
-#    $1 = /path/to/pid.file
-# Returns:
-#    0 if alive pid file remains
-#    1 if dead pid file removed
-#    2 if no pid file found
-
-check_pid_status()
-{
-    local RESULT=2   # assume no pid file will be found
-    local PID=$(read_pid ${1})
-
-    if [ -n "${PID}" ] ; then
-	ps --no-headers ${PID} > /dev/null 2>&1
-	if [ "${?}" -eq 0 ] ; then
-	    RESULT=0
-	else
-	    rm -f ${1} 
-	    RESULT=1
-	fi
-    fi
-
-    return ${RESULT}
-}
-
-# Parameters: 
-#    None
-# Returns:
-#    0 true 
-#    1 false and echos /pathname/to/pid/file
-
-is_zope_dead()
-{
-    local RESULT=
-
-    if [ -n "${INSTANCE_HOME}" ] ; then
-	loc=${INSTANCE_HOME}
-    else
-	loc=${ZOPE_HOME}
-    fi
-
-    check_pid_status ${loc}/var/Z2.pid
-    RESULT=${?}
-    if [ "${RESULT}" -eq 0 ] ; then 
-	echo "${loc}"
-	RESULT=10
-	break    # found a live pid
-    fi
-
-    if [ "${RESULT}" -eq 10 ] ; then
-	RESULT=1
-    else
-	RESULT=0
-    fi
-
-    return ${RESULT}
-}
-
-status()
-{ 
-
-    if is_zope_dead ; then
-	eerror "--> Zope is dead."
-    else
-	einfo "--> Zope is alive."
-    fi
-
-    return ! is_zope_dead
-}
-
-# If Zope is dead, remove PID file and start zope.
-# The idea with 'env' is that a environment snapshot
-# (current vars + /etc/conf.d/zope?) is created for zope to use.
-
-start_zope()
-{
-    local RESULT=
-
-    is_zope_dead >/dev/null
-    RESULT=${?}
-    if [ "${RESULT}" -eq 0 ] ; then
-	setup_exports
-	umask 077    # Recommended by Zope
-	env /usr/bin/${python} ${ZOPE_HOME}z2.py ${ZOPE_OPTS} &         
-	RESULT=${?}
-    else
-	echo 'Zope is running independant of RC management.'
-	echo 'We are going to try and  kill it.'
-	stop_zope
-	if [ "${?}" -eq 0 ] ; then
-	    echo 'Successfully killed zope. Try to start zope again'
-	fi
-    fi
-
-    return ${RESULT}
-}
-
-# If Zope is alive, kill it.
-
-stop_zope()
-{
-    local PID=$(is_zope_dead)
-
-    if [ -n "${PID}" ] ; then
-	kill $(cat ${PID}/var/Z2.pid)    # Not sure if kill always succeeds, so not removeing .pid file.
-    fi
-    return $?
-}
-
-# 
-
-start()
-{
-    ebegin "Starting zope"
-    start_zope
-    eend $? "Failed to start zope"
-}
-
-#
-
-stop()
-{
-    ebegin "Stopping zope"
-    stop_zope
-    eend $? "Failed to stop zope"
-}
diff --git a/net-zope/zope/files/2.6.0/zope.envd b/net-zope/zope/files/2.6.0/zope.envd
deleted file mode 100644
index 0ab9e3fb0df0..000000000000
--- a/net-zope/zope/files/2.6.0/zope.envd
+++ /dev/null
@@ -1,79 +0,0 @@
-#-- Zope installation
-
-#INSTANCE_HOME=
-#SOFTWARE_HOME=
-#ZOPE_HOME=
-#FORCE_PRODUCT_LOAD=
-
-#-- Profiling
-
-#PROFILE_PUBLISHER=
-
-#-- SiteAccess
-
-#SUPPRESS_ACCESSRULE=
-#SUPPRESS_SITEROOT=
-
-#-- ZEO
-
-#CLIENT_HOME=
-#ZEO_CLIENT=
-
-#-- Debugging and Logging
-
-#EVENT_LOG_FORMAT=
-#EVENT_LOG_FILE=
-#EVENT_LOG_SEVERITY=
-#ZSYSLOG=
-#ZSYSLOG_FACILITY=
-#ZSYSLOG_SERVER=
-#ZSYSLOG_ACCESS=
-#ZSYSLOG_ACCESS_FACILITY=
-#ZSYSLOG_ACCESS_SERVER=
-#Z_DEBUG_MODE=
-
-#-- Misc.
-
-#Z_REALM
-
-#-- Security related
-
-#NO_SECURITY=
-#ZOPE_SECURITY_POLICY=
-#ZSP_OWNEROUS_SKIP=
-#ZSP_AUTHENTICATED_SKIP=
-#DISALLOW_LOCAL_PRODUCTS=
-
-#-- ZODB related
-
-#ZOPE_DATABASE_QUOTA=
-#ZOPE_READ_ONLY=
-
-#-- Session related
-
-#ZSESSION_ADD_NOTIFY=
-#ZSESSION_DEL_NOTIFY=
-#ZSESSION_TIMEOUT_MINS=
-#ZSESSION_OBJECT_LIMIT=
-
-#-- WebDAV
-
-#WEBDAV_SOURCE_PORT_CLIENTS=
-
-#-- Structured Text
-
-#STX_DEFAULT_LEVEL=
-
-#-- DTML
-
-#ZOPE_DTML_REQUEST_AUTOQUOTE=
-
-#-- Esoteric
-
-#Z_MAX_STACK_SIZE=
-#FORCE_PRODUCT_RELOAD=
-
-
-
-
-
diff --git a/net-zope/zope/files/2.6.0/zope.initd b/net-zope/zope/files/2.6.0/zope.initd
deleted file mode 100644
index f08a15e5a823..000000000000
--- a/net-zope/zope/files/2.6.0/zope.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.6.0/zope.initd,v 1.1 2003/03/03 23:43:22 kutsuya Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting zope"
-	start-stop-daemon -S -q --pidfile ${ZOPE_HOME}var/Z2.pid \
-	--startas /usr/bin/python2.1 -- ${ZOPE_HOME}z2.py ${ZOPE_OPTS}
-	eend $? "Failed to start zope"
-}
-
-stop() {
-	ebegin "Stopping zope"
-	start-stop-daemon -o -q -K --pidfile ${ZOPE_HOME}var/Z2.pid
-	RESULT=${?}
-
-	# In case we have to kill zope by hand.
-	mv ${ZOPE_HOME}var/Z2.pid ${ZOPE_HOME}var/Z2.pid.old
-	eend $RESULT "Failed to stop zope"
-}
-
-
-
-
-
diff --git a/net-zope/zope/files/digest-zope-2.6.0 b/net-zope/zope/files/digest-zope-2.6.0
deleted file mode 100644
index c2e2d34bcace..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0bb91ca1df775aebfc8ff8c46afa3a9 Zope-2.6.0-src.tgz 2291282
diff --git a/net-zope/zope/files/digest-zope-2.6.0-r1 b/net-zope/zope/files/digest-zope-2.6.0-r1
deleted file mode 100644
index c2e2d34bcace..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0bb91ca1df775aebfc8ff8c46afa3a9 Zope-2.6.0-src.tgz 2291282
diff --git a/net-zope/zope/files/digest-zope-2.6.0-r2 b/net-zope/zope/files/digest-zope-2.6.0-r2
deleted file mode 100644
index c2e2d34bcace..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0bb91ca1df775aebfc8ff8c46afa3a9 Zope-2.6.0-src.tgz 2291282
diff --git a/net-zope/zope/files/digest-zope-2.6.0-r3 b/net-zope/zope/files/digest-zope-2.6.0-r3
deleted file mode 100644
index c2e2d34bcace..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0bb91ca1df775aebfc8ff8c46afa3a9 Zope-2.6.0-src.tgz 2291282
diff --git a/net-zope/zope/files/digest-zope-2.6.2 b/net-zope/zope/files/digest-zope-2.6.2
new file mode 100644
index 000000000000..058a602089fb
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.6.2
@@ -0,0 +1 @@
+MD5 a0e873d54994231d7c03640f7092a4fb Zope-2.6.2-src.tgz 2347004
diff --git a/net-zope/zope/zope-2.6.0-r1.ebuild b/net-zope/zope/zope-2.6.0-r1.ebuild
deleted file mode 100644
index 5f3605043a9a..000000000000
--- a/net-zope/zope/zope-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.0-r1.ebuild,v 1.4 2003/09/08 06:02:05 msterret Exp $
-
-S="${WORKDIR}/Zope-${PV}-src"
-
-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/${PV}/Zope-${PV}-src.tgz"
-LICENSE="ZPL"
-SLOT="0"
-
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4
-	=dev-lang/python-2.1.3*"
-
-ZOPEDIR="${DESTTREE}/share/zope/${PV}/"
-
-src_compile() {
-	python2.1 wo_pcgi.py || die "Failed to compile."
-}
-
-src_install() {
-
-	dodoc LICENSE.txt README.txt
-	docinto doc ; dodoc doc/*.txt
-	docinto doc/PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto doc/changenotes ; dodoc doc/changenotes/*
-
-	# using '/etc/init.d/zope'
-	rm -Rf start stop LICENCE.txt doc/
-
-	# copy the remaining contents of ${S} into the ${D}.
-	dodir ${ZOPEDIR}
-	cp -a . ${D}${ZOPEDIR}
-
-	# Add a rc-script.
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PV}/zope.initd zope
-
-	# Add a env.d script.
-	insinto /etc/env.d ; doins ${FILESDIR}/${PV}/zope.envd
-
-	# Fill in an env.d variable.
-	sed -i \
-		-e "/ZOPE_HOME/ c\\ZOPE_HOME=${ZOPEDIR}\\" ${D}/etc/env.d/zope.envd || \
-		die "sed zope.envd failed"
-
-	# Add a conf.d script.
-	dodir /etc/conf.d
-	echo -e "ZOPE_OPTS='-u root'\nZOPE_HOME=${ZOPEDIR}" > ${D}/etc/conf.d/zope
-
-	# Keep others from overwritting PID files
-	fperms o+t ${ZOPEDIR}var/
-
-	# Useful link
-	dosym /usr/share/doc/${P}/doc/ ${ZOPEDIR}doc
-}
-
-pkg_postinst() {
-	einfo "To get zope running you must execute the following:"
-	einfo "\tebuild /var/db/pkg/net-zope/${PF}/${PF}.ebuild config"
-}
-
-pkg_config() {
-	einfo ">>> Create initial user..."
-	python2.1 ${ROOT}${ZOPEDIR}zpasswd.py ${ROOT}${ZOPEDIR}inituser
-}
diff --git a/net-zope/zope/zope-2.6.0-r2.ebuild b/net-zope/zope/zope-2.6.0-r2.ebuild
deleted file mode 100644
index 712d4cf13ff4..000000000000
--- a/net-zope/zope/zope-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.0-r2.ebuild,v 1.4 2003/09/08 06:02:53 msterret Exp $
-
-S="${WORKDIR}/Zope-${PV}-src"
-
-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/${PV}/Zope-${PV}-src.tgz"
-LICENSE="ZPL"
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc"
-
-RDEPEND="=dev-lang/python-2.1.3*"
-DEPEND="virtual/glibc
-		>=sys-apps/sed-4.0.5
-		app-admin/zope-config
-	   ${RDEPEND}"
-
-ZUID=zope
-ZGID=$(echo ${P} |sed -e "s:\.:_:g")
-ZSERVDIR="${DESTTREE}/share/zope/${PF}/"
-ZINSTDIR=$"/var/lib/zope/${ZGID}"
-CONFDIR="/etc/conf.d/"
-
-# Narrow the scope of ownership/permissions.
-# Security plan:
-# * ZUID is the superuser for all zope instances.
-# * ZGID is for a single instance's administration.
-# * Other's should not have any access to ${ZSERVDIR},
-#   because they can work through the Zope web interface.
-#   This should protect our code/data better.
-
-#Parameters:
-# $1 = instance directory
-# $2 = group
-
-setup_security()
-{
-	chown -R ${ZUID}:${2} ${1}
-	chmod -R g+u ${1}
-	chmod -R o-rwx ${1}
-}
-
-install_help()
-{
-	einfo "Need to setup an inituser (admin) before executing zope:"
-	einfo "\tzope-config --zpasswd"
-	einfo "To execute default Zope instance:"
-	einfo "\t/etc/init.d/${ZGID} start"
-}
-
-pkg_setup() {
-	if ! groupmod ${ZGID} > /dev/null 2>&1 ; then
-		groupadd ${ZGID} || die "Can not add ${ZGID} group!"
-	fi
-	if ! id ${ZUID} > /dev/null 2>&1 ; then
-		useradd -d ${ZSERVDIR} -c "Zope dedicatedr-user" ${ZUID} \
-	|| die "Can not add ${ZUID} user!"
-	fi
-}
-
-src_unpack()
-{
-	unpack ${A}
-	# DateTime 2.6.0(only) rfc822 fix
-	einfo "Applying patches..."
-	bzcat ${FILESDIR}/${PV}/DateTime.py.bz2 \
-		> ${S}/lib/python/DateTime/DateTime.py	|| die "Patch failed"
-}
-
-src_compile() {
-	python2.1 wo_pcgi.py || die "Failed to compile."
-}
-
-src_install() {
-	dodoc LICENSE.txt README.txt
-	docinto doc ; dodoc doc/*.txt
-	docinto doc/PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto doc/changenotes ; dodoc doc/changenotes/*
-
-	# using '/etc/init.d/zope'
-	rm -Rf start stop LICENSE.txt README.txt doc/
-
-	# Need to rip out the zinstance stuff out
-	# but save as templates
-	mkdir .templates
-	mv -f Extensions/ .templates/
-	mv -f import/ .templates/
-	mv -f var/ .templates/
-
-	# Add conf.d script.
-	dodir /etc/conf.d
-	echo "ZOPE_OPTS=\"-u zope\"" | \
-	cat - ${FILESDIR}/${PV}/zope.envd > .templates/zope.confd
-
-	# Fill in environmental variables
-	sed -i -e "/ZOPE_HOME=/ c\\ZOPE_HOME=${ZSERVDIR}\\ " \
-		-e "/SOFTWARE_HOME=/ c\\SOFTWARE_HOME=${ZSERVDIR}/lib/python\\ " \
-	.templates/zope.confd
-
-	# Add rc-script.
-	cp ${FILESDIR}/${PV}/zope-r1.initd .templates/zope.initd
-
-	# Copy the remaining contents of ${S} into the ${D}.
-	dodir ${ZSERVDIR}
-	cp -a . ${D}${ZSERVDIR}
-
-	setup_security ${D}${ZSERVDIR} ${ZGID}
-}
-
-pkg_postinst()
-{
-	# Here we add our default zope instance.
-	/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} \
-		--zgid=${ZGID}
-	install_help
-}
-
-pkg_config()
-{
-	install_help
-}
diff --git a/net-zope/zope/zope-2.6.0.ebuild b/net-zope/zope/zope-2.6.0.ebuild
deleted file mode 100644
index e757c393c06b..000000000000
--- a/net-zope/zope/zope-2.6.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.0.ebuild,v 1.3 2003/09/08 06:02:05 msterret Exp $
-
-S="${WORKDIR}/Zope-${PV}-src"
-
-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/${PV}/Zope-${PV}-src.tgz"
-LICENSE="ZPL"
-SLOT="0"
-
-# TODO: needs to be confirmed on other platforms.
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc
-	dev-lang/python"
-
-ZOPEDIR="${DESTTREE}/share/zope/${PV}/"
-
-src_compile() {
-	python w_pcgi.py || die
-}
-
-src_install() {
-	ENVD_DIR=etc/env.d/
-	CONFD_DIR=etc/conf.d/
-
-	# move the main docs and compress them.
-	dodoc LICENSE.txt README.txt
-
-	docinto doc
-	dodoc doc/*.txt
-
-	docinto doc/PLATFORMS
-	dodoc doc/PLATFORMS/*
-
-	docinto doc/changenotes
-	dodoc doc/changenotes/*
-
-	#rm -fr LICENSE.txt README.txt doc/
-
-	# patch some paths.
-	sed -e "s:${S}:${ZOPEDIR}:" Zope.cgi > Zope.cgi.tmp
-	mv Zope.cgi.tmp Zope.cgi
-	chmod 755 Zope.cgi  # restoring permissions
-
-	# using '/etc/init.d/zope' instead
-	rm -f start stop
-
-	# Keep others from overwritting PID files
-	chmod o+t var/
-
-	# copy the remaining contents of ${S} into the ${D}.
-	dodir ${ZOPEDIR}
-	cp -a . ${D}${ZOPEDIR}
-
-	# Add a rc-script.
-	insinto /etc/init.d
-	newins ${FILESDIR}/${PV}/zope.initd zope
-
-	# Add a env.d script.
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}/zope.envd
-
-	# Fill in an env.d variable.
-	sed -e "/ZOPE_HOME/ c\\ZOPE_HOME=${ZOPEDIR}\\" ${D}${ENVD_DIR}zope.envd \
-	> ${D}${ENVD_DIR}zope.tmp
-	mv ${D}${ENVD_DIR}zope.tmp ${D}${ENVD_DIR}50zope
-
-	# Add a conf.d script.
-	dodir ${CONFD_DIR}
-	echo -e "ZOPE_OPTS='-u root'\nZOPE_HOME=${ZOPEDIR}" > ${D}${CONFD_DIR}zope
-}
-
-pkg_postinst() {
-	einfo "To get zope running you must execure the following:"
-	einfo "\tebuild /var/db/pkg/net-www/${PF}/${P}.ebuild config"
-}
-
-pkg_config() {
-	einfo ">>> Create inital user...${ROOT}\n"
-	python ${ROOT}${ZOPEDIR}zpasswd.py ${ROOT}${ZOPEDIR}inituser
-}
-
diff --git a/net-zope/zope/zope-2.6.0-r3.ebuild b/net-zope/zope/zope-2.6.2.ebuild
index 774c3aad18c5..954fe2f53fb3 100644
--- a/net-zope/zope/zope-2.6.0-r3.ebuild
+++ b/net-zope/zope/zope-2.6.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.0-r3.ebuild,v 1.3 2003/09/08 06:02:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.2.ebuild,v 1.1 2003/10/30 14:58:06 lanius Exp $
+
+inherit eutils
 
 S="${WORKDIR}/Zope-${PV}-src"
 
@@ -10,7 +12,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-src.tgz"
 LICENSE="ZPL"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 # This is for developers that wish to test Zope with virtual/python.
 # If this is a problem, let me know right away. --kutsuya@gentoo.org
@@ -27,11 +29,9 @@ else
 fi
 
 DEPEND="virtual/glibc
-		>=sys-apps/sed-4.0.5
-	   ${RDEPEND}"
+		>=sys-apps/sed-4.0.5"
 
-RDEPEND="app-admin/zope-config
-	${RDEPEND}"
+RDEPEND="app-admin/zope-config"
 
 ZUID=zope
 ZGID=$(echo ${P} |sed -e "s:\.:_:g")
@@ -40,7 +40,7 @@ ZI_DIR=${ROOT}/var/lib/zope/
 ZSERVDIR=${ZS_DIR}/${PF}/
 ZINSTDIR=${ZI_DIR}/${ZGID}
 CONFDIR=${ROOT}/etc/conf.d/
-RCNAME=zope-r2.initd
+RCNAME=zope.initd
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
@@ -50,65 +50,38 @@ RCNAME=zope-r2.initd
 #   because they can work through the Zope web interface.
 #   This should protect our code/data better.
 
-#Parameters:
-# $1 = instance directory
-# $2 = group
+# Parameters:
+#  $1 = instance directory
+#  $2 = group
 
-setup_security()
-{
+setup_security() {
 	chown -R ${ZUID}:${2} ${1}
 	chmod -R g+u ${1}
 	chmod -R o-rwx ${1}
 }
 
-#
-
-install_help()
-{
-	einfo "Need to setup an inituser \(admin\) before executing zope:"
+install_help() {
+	einfo "Need to setup an inituser (admin) before executing zope:"
 	einfo "\tzope-config --zpasswd"
 	einfo "To execute default Zope instance:"
-	einfo "\t/etc/conf.d/${ZGID} start"
+	einfo "\t/etc/init.d/${ZGID} start"
 }
 
-#
-
-pkg_setup()
-{
+pkg_setup() {
 	if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
 		ewarn "WARNING: You set PYTHON_SLOT_VERSION=VIRTUAL. So this ebuild will"
 		ewarn "use python-2.2*. Zope Corp. only recommends using python-2.1.3 "
 		ewarn "with this version of zope. Emerge at your own risk."
 		sleep 12
 	fi
-	if ! groupmod ${ZGID} > /dev/null 2>&1 ; then
-		groupadd ${ZGID} || die "Can not add ${ZGID} group!"
-	fi
-	if ! id ${ZUID} > /dev/null 2>&1 ; then
-		useradd -d ${ZS_DIR} -c "Zope root user" -u 261 ${ZUID} \
-	|| die "Can not add ${ZUID} user!"
-	fi
+	enewgroup ${ZGID}
+	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
 }
 
-#
-
-src_unpack()
-{
-	unpack ${A}
-	# DateTime 2.6.0(only) rfc822 fix
-	einfo "Applying patch..."
-	bzcat ${FILESDIR}/${PV}/DateTime.py.bz2 \
-		> ${S}/lib/python/DateTime/DateTime.py	|| die "Patch failed"
-}
-
-#
-
 src_compile() {
 	$python wo_pcgi.py || die "Failed to compile."
 }
 
-#
-
 src_install() {
 	dodoc LICENSE.txt README.txt
 	docinto doc ; dodoc doc/*.txt
@@ -128,7 +101,7 @@ src_install() {
 	# Add conf.d script.
 	dodir /etc/conf.d
 	echo "ZOPE_OPTS=\"-u zope\"" | \
-	cat - ${FILESDIR}/${PV}/zope.envd > .templates/zope.confd
+	cat - ${FILESDIR}/2.6.1/zope.envd > .templates/zope.confd
 
 	# Fill in environmental variables
 	sed -i -e "/ZOPE_HOME=/ c\\ZOPE_HOME=${ZSERVDIR}\\ " \
@@ -137,7 +110,7 @@ src_install() {
 
 	# Add rc-script.
 	#!! TODO: fill in $python in zope-r2.initd
-	sed -e "/python=/ c\\python=\"${python}\"\\ " ${FILESDIR}/${PV}/${RCNAME} \
+	sed -e "/python=/ c\\python=\"${python}\"\\ " ${FILESDIR}/2.6.1/${RCNAME} \
 		> .templates/zope.initd
 
 	# Copy the remaining contents of ${S} into the ${D}.
@@ -147,27 +120,15 @@ src_install() {
 	setup_security ${D}${ZSERVDIR} ${ZGID}
 }
 
-
-#
-
-pkg_postinst()
-{
+pkg_postinst() {
 	# Here we add our default zope instance.
 	/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} \
 		--zgid=${ZGID}
 	install_help
 }
 
-#
-
-pkg_postrm()
-{
-	# Remove the rcscript and confd file. Emerge won't do it because it
-	# didn't add them. zope-config did added them. This will change when
-	# zope-config can remove instances.
-
-	rm -f ${CONFDIR}/${ZGID} /etc/init.d/${ZGID}
-
+pkg_postrm() {
+	# rcscripts and conf.d files will remain. i.e. /etc protection.
 
 	# Delete .default if this ebuild is the default. zprod-manager will
 	# have to handle a missing default;
@@ -177,10 +138,6 @@ pkg_postrm()
 	fi
 }
 
-
-#
-
-pkg_config()
-{
+pkg_config() {
 	install_help
 }