DEPEND on sed >= 4 in zope-2.6.0-r1.ebuild

3 files changed, 29 insertions, 23 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 69e0fccca860..08f2ddfae716 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,8 +1,11 @@
 # 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.4 2003/04/04 03:05:26 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.5 2003/06/09 22:05:10 msterret Exp $
 
-06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords 
+06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  09 Jun 2003; <msterret@gentoo.org> zope-2.6.0-r1.ebuild:
+  DEPEND on sed >= 4 in zope-2.6.0-r1.ebuild
 
 *zope-2.6.1 (26 Feb 2003)
 
@@ -11,26 +14,26 @@
 
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to     net-zope.
 
-  26 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : Version bump.	
+  26 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : Version bump.
 
 *zope-2.6.0-r3 (25 Feb 2003)
 
-  25 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-r2.initd : A bug fix 
-  revision mostly. Fixed dependencies. Changed SLOT back to 0, hopefully this 
+  25 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-r2.initd : A bug fix
+  revision mostly. Fixed dependencies. Changed SLOT back to 0, hopefully this
   won't cause too much trouble. Changed 'zope' user abit in pkg_seup().Added
   RCNAME as a global varibale to ease revising the rcscripts. Fixed 'example
-  zope applications,' which was mention by Macros73 to be missing. Also added 
-  the option, for developers, of using virtual/python with 
-  PYTHON_SLOT_VERSION=VIRTUAL. 
+  zope applications,' which was mention by Macros73 to be missing. Also added
+  the option, for developers, of using virtual/python with
+  PYTHON_SLOT_VERSION=VIRTUAL.
 
 *zope-2.6.0-r2 (16 Feb 2003)
 
   16 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : A major revision.
   New rcscript (along with zope-config) makes it possible to have several zope
-  instances runing at the same time. Also has better PID management fixing 
-  #14173. /etc/env.d/zope and /etc/conf.d/zope are now placed in 
+  instances runing at the same time. Also has better PID management fixing
+  #14173. /etc/env.d/zope and /etc/conf.d/zope are now placed in
   /etc/conf.d/zope-2_6_0. Also added a DateTime patch. Improved security.
-  
+
 *zope-2.6.0-r1 (23 Nov 2002)
 
   10 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-2.6.0-r1.ebuild:
@@ -38,7 +41,7 @@
 
   23 Nov 2002; Grant Goodyear <g2boojum@gentoo.org> zope-2.6.0-r1.ebuild :
   Added ebuild from Bug #10758 (thanks to Maurizio Disimino!) which should
-  ensure that python 2.1.3* is used, the init script is now properly 
+  ensure that python 2.1.3* is used, the init script is now properly
   located in /etc/init.d, and probably one or two other fixes.
 
 *zope-2.6.0 (24 Oct 2002)
@@ -47,12 +50,12 @@
   Security update. Ebuild contributed by Jason S <kutsuya1@yahoo.com> in #9474.
 
 *zope-2.5.1 (2 Jul 2002)
-	
+
   2 Jul 2002; Jon Nelson <jnelson@gentoo.org> zope-2.5.1.ebuild:
-  Use python 2.1.3 ebuild explicitly  
+  Use python 2.1.3 ebuild explicitly
   Thanks for Matt Behrens <matt@zigg.com>
   Hopefully closes #468
-  
+
 *unreleased-as-yet-still-using-masked-zope-2.4.0-r6
 
   1 Jul 2002; Jon Nelson <jnelson@gentoo.org> zope-2.4.0-r6:
@@ -63,4 +66,4 @@
 *zope-2.4.0-r6 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : Initial import.
-  
+
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 78d85ee35fc2..4105876147e5 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,7 +1,7 @@
-MD5 245a681f07d4061ddc9748b120c1333f ChangeLog 2697
+MD5 a6f61086c90454f6398c78203219e237 ChangeLog 2784
 MD5 33dd6a911b11940f313d842266153970 zope-2.4.0-r6.ebuild 2984
 MD5 32138a0eb3d81f2bf9da9c96ffa74301 zope-2.5.1.ebuild 2946
-MD5 adbd1c40a8e89e0f29ec63f4792122d8 zope-2.6.0-r1.ebuild 1805
+MD5 437d4a5cb301a6ccab04878ac302c64b zope-2.6.0-r1.ebuild 1850
 MD5 e5f0bf91c67b1e2a74da81450fde95df zope-2.6.0-r2.ebuild 3202
 MD5 7340a115aa6c9a548696787d00656e82 zope-2.6.0-r3.ebuild 4628
 MD5 3b787684396a148f0dcde2bc8b387514 zope-2.6.0.ebuild 2084
diff --git a/net-zope/zope/zope-2.6.0-r1.ebuild b/net-zope/zope/zope-2.6.0-r1.ebuild
index 772d3296ee09..7d4f0caf06dc 100644
--- a/net-zope/zope/zope-2.6.0-r1.ebuild
+++ b/net-zope/zope/zope-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2003/03/11 05:31:04 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.0-r1.ebuild,v 1.3 2003/06/09 22:05:10 msterret Exp $
 
 S="${WORKDIR}/Zope-${PV}-src"
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
+	>=sys-apps/sed-4
 	=dev-lang/python-2.1.3*"
 
 ZOPEDIR="${DESTTREE}/share/zope/${PV}/"
@@ -42,14 +43,16 @@ src_install() {
 	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
-    
+	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/
+	fperms o+t ${ZOPEDIR}var/
 
 	# Useful link
 	dosym /usr/share/doc/${P}/doc/ ${ZOPEDIR}doc
@@ -60,7 +63,7 @@ pkg_postinst() {
 	einfo "\tebuild /var/db/pkg/net-zope/${PF}/${PF}.ebuild config"
 }
 
-pkg_config() {	
+pkg_config() {
 	einfo ">>> Create initial user..."
 	python2.1 ${ROOT}${ZOPEDIR}zpasswd.py ${ROOT}${ZOPEDIR}inituser
 }