Making repoman happy

(Portage version: 2.1.4.4)

14 files changed, 82 insertions, 138 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index ad8de06dd068..f13a3c5c6d7b 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.134 2008/05/11 19:13:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.135 2008/05/27 20:59:50 tupone Exp $
+
+  27 May 2008; Tupone Alfredo <tupone@gentoo.org> zope-2.7.9.ebuild,
+  zope-2.8.4.ebuild, zope-2.8.6.ebuild, zope-2.8.7.ebuild,
+  zope-2.8.8.ebuild, zope-2.8.9.ebuild, zope-2.8.9.1.ebuild,
+  zope-2.9.3.ebuild, zope-2.9.7.ebuild, zope-2.10.3.ebuild,
+  zope-2.10.4.ebuild, zope-3.2.2.ebuild, zope-3.3.1.ebuild:
+  Making repoman happy
 
 *zope-2.10.6 (11 May 2008)
 
diff --git a/net-zope/zope/zope-2.10.3.ebuild b/net-zope/zope/zope-2.10.3.ebuild
index efd793f267ee..e398154ff51b 100644
--- a/net-zope/zope/zope-2.10.3.ebuild
+++ b/net-zope/zope/zope-2.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.10.3.ebuild,v 1.2 2007/04/06 21:27:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.10.3.ebuild,v 1.3 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -37,11 +37,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure  --prefix="${D}${ZSERVDIR}" --with-python=/usr/bin/python2.4 || die "Failed to execute ./configure ..."
 	emake || die "Failed to compile."
@@ -53,12 +48,12 @@ src_install() {
 	docinto PLATFORMS ; dodoc Zope/doc/PLATFORMS/*
 	docinto ZEO ; dodoc Zope/doc/ZEO/*
 
-	make install prefix=${D}${ZSERVDIR} || die "Failed to install into ${D}${ZSERVDIR}"
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install prefix="${D}"${ZSERVDIR} || die "Failed to install into ${D}${ZSERVDIR}"
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 
 	# copy the init script skeleton to skel directory of our installation
-	cp ${FILESDIR}/zope.initd ${D}/${ZSERVDIR}/skel/zope.initd
+	cp "${FILESDIR}"/zope.initd "${D}"/${ZSERVDIR}/skel/zope.initd
 }
 
 src_test() {
diff --git a/net-zope/zope/zope-2.10.4.ebuild b/net-zope/zope/zope-2.10.4.ebuild
index d06154c7345c..8185fa2a3098 100644
--- a/net-zope/zope/zope-2.10.4.ebuild
+++ b/net-zope/zope/zope-2.10.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.10.4.ebuild,v 1.1 2007/09/01 16:38:05 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.10.4.ebuild,v 1.2 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -37,11 +37,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure  --prefix="${D}${ZSERVDIR}" --with-python=/usr/bin/python2.4 || die "Failed to execute ./configure ..."
 	emake || die "Failed to compile."
@@ -53,12 +48,12 @@ src_install() {
 	docinto PLATFORMS ; dodoc Zope/doc/PLATFORMS/*
 	docinto ZEO ; dodoc Zope/doc/ZEO/*
 
-	make install prefix=${D}${ZSERVDIR} || die "Failed to install into ${D}${ZSERVDIR}"
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install prefix="${D}"${ZSERVDIR} || die "Failed to install into ${D}${ZSERVDIR}"
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 
 	# copy the init script skeleton to skel directory of our installation
-	cp ${FILESDIR}/zope.initd ${D}/${ZSERVDIR}/skel/zope.initd
+	cp "${FILESDIR}"/zope.initd "${D}"/${ZSERVDIR}/skel/zope.initd
 }
 
 src_test() {
diff --git a/net-zope/zope/zope-2.7.9.ebuild b/net-zope/zope/zope-2.7.9.ebuild
index 17fe660f0431..804305e2ade2 100644
--- a/net-zope/zope/zope-2.7.9.ebuild
+++ b/net-zope/zope/zope-2.7.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.9.ebuild,v 1.7 2007/06/26 02:39:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.9.ebuild,v 1.8 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils
 
@@ -40,11 +40,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -73,23 +68,23 @@ src_install() {
 		einfo "create the file sitecustomize.py inside your site-packages"
 	 	einfo "import sys"
 		einfo "sys.setdefaultencoding('utf8')"
-		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/2.7.8/i18n-1.0.0.patch
+		cd "${S}"/lib/python/StructuredText/
+		epatch "${FILESDIR}"/2.7.8/i18n-1.0.0.patch
 		epause 15
-		cd ${S}
+		cd "${S}"
 	fi
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
-	skel=${D}${ZSERVDIR}/skel
+	skel="${D}"${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd ${skel}/zope.initd
 
 	# hotfixes to be applied
-	cp -a ${WORKDIR}/Hotfix_20060821/ ${D}${ZSERVDIR}/lib/python/Products/
+	cp -a "${WORKDIR}"/Hotfix_20060821/ "${D}"${ZSERVDIR}/lib/python/Products/
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.8.4.ebuild b/net-zope/zope/zope-2.8.4.ebuild
index 1e1395a899fd..a1346aeb850f 100644
--- a/net-zope/zope/zope-2.8.4.ebuild
+++ b/net-zope/zope/zope-2.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.4.ebuild,v 1.8 2007/06/26 02:39:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.4.ebuild,v 1.9 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -38,11 +38,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -77,17 +72,17 @@ src_install() {
 		#cd ${S}/lib/python/StructuredText/
 		#epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
 		epause 15
-		cd ${S}
+		cd "${S}"
 	fi
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
 	skel=${D}${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${skel}"/zope.initd
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.8.6.ebuild b/net-zope/zope/zope-2.8.6.ebuild
index 46a51db6b0c9..65b6bd4bfcce 100644
--- a/net-zope/zope/zope-2.8.6.ebuild
+++ b/net-zope/zope/zope-2.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.6.ebuild,v 1.3 2007/06/26 02:39:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.6.ebuild,v 1.4 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -38,11 +38,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -77,17 +72,17 @@ src_install() {
 		#cd ${S}/lib/python/StructuredText/
 		#epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
 		epause 15
-		cd ${S}
+		cd "${S}"
 	fi
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
 	skel=${D}${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${skel}"/zope.initd
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.8.7.ebuild b/net-zope/zope/zope-2.8.7.ebuild
index bb97d8102f26..d0cfee31e35a 100644
--- a/net-zope/zope/zope-2.8.7.ebuild
+++ b/net-zope/zope/zope-2.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.7.ebuild,v 1.2 2007/06/26 02:39:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.7.ebuild,v 1.3 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -38,11 +38,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -77,17 +72,17 @@ src_install() {
 		#cd ${S}/lib/python/StructuredText/
 		#epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
 		epause 15
-		cd ${S}
+		cd "${S}"
 	fi
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
 	skel=${D}${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${skel}"/zope.initd
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.8.8.ebuild b/net-zope/zope/zope-2.8.8.ebuild
index 7517915eaa37..5df803cdfc44 100644
--- a/net-zope/zope/zope-2.8.8.ebuild
+++ b/net-zope/zope/zope-2.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.8.ebuild,v 1.6 2006/09/03 15:39:30 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.8.ebuild,v 1.7 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -40,11 +40,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -56,17 +51,17 @@ src_install() {
 	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
 	docinto ZEO ; dodoc doc/ZEO/*
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
 	skel=${D}${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${skel}"/zope.initd
 
 	# hotfixes to be applied
-	cp -a ${WORKDIR}/Hotfix_20060821/ ${D}${ZSERVDIR}/lib/python/Products/
+	cp -a "${WORKDIR}"/Hotfix_20060821/ "${D}"${ZSERVDIR}/lib/python/Products/
 
 }
 
diff --git a/net-zope/zope/zope-2.8.9.1.ebuild b/net-zope/zope/zope-2.8.9.1.ebuild
index cdbc15d75ac1..292cb0056e3f 100644
--- a/net-zope/zope/zope-2.8.9.1.ebuild
+++ b/net-zope/zope/zope-2.8.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.9.1.ebuild,v 1.6 2007/04/11 18:48:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.9.1.ebuild,v 1.7 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -38,11 +38,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -54,14 +49,14 @@ src_install() {
 	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
 	docinto ZEO ; dodoc doc/ZEO/*
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
 	skel=${D}${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${skel}"/zope.initd
 }
 
 src_test() {
diff --git a/net-zope/zope/zope-2.8.9.ebuild b/net-zope/zope/zope-2.8.9.ebuild
index 0134a0e42e29..a69aa3e70496 100644
--- a/net-zope/zope/zope-2.8.9.ebuild
+++ b/net-zope/zope/zope-2.8.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.9.ebuild,v 1.2 2007/04/06 21:27:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.9.ebuild,v 1.3 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -38,11 +38,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
@@ -54,14 +49,14 @@ src_install() {
 	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
 	docinto ZEO ; dodoc doc/ZEO/*
 
-	make install PREFIX=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install PREFIX="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 	# copy the init script skeleton to skel directory of our installation
 	skel=${D}${ZSERVDIR}/skel
 	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
 	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${skel}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${skel}"/zope.initd
 }
 
 src_test() {
diff --git a/net-zope/zope/zope-2.9.3.ebuild b/net-zope/zope/zope-2.9.3.ebuild
index f36b3ad1f24d..7d39bee5c0d6 100644
--- a/net-zope/zope/zope-2.9.3.ebuild
+++ b/net-zope/zope/zope-2.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.3.ebuild,v 1.1 2006/05/27 12:57:45 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.3.ebuild,v 1.2 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -37,11 +37,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure  --prefix=. --force --with-python=/usr/bin/python2.4 || die "Failed to execute ./configure ..."
 	emake || die "Failed to compile."
@@ -53,12 +48,12 @@ src_install() {
 	docinto PLATFORMS ; dodoc Zope/doc/PLATFORMS/*
 	docinto ZEO ; dodoc Zope/doc/ZEO/*
 
-	make install prefix=${D}${ZSERVDIR}
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install prefix="${D}"${ZSERVDIR}
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 
 	# copy the init script skeleton to skel directory of our installation
-	cp ${FILESDIR}/zope.initd ${D}/${ZSERVDIR}/skel/zope.initd
+	cp "${FILESDIR}"/zope.initd "${D}"/${ZSERVDIR}/skel/zope.initd
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.9.7.ebuild b/net-zope/zope/zope-2.9.7.ebuild
index 9513b0b1de14..5aae26982c58 100644
--- a/net-zope/zope/zope-2.9.7.ebuild
+++ b/net-zope/zope/zope-2.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.7.ebuild,v 1.2 2007/04/06 21:27:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.7.ebuild,v 1.3 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -37,11 +37,6 @@ ZSERVDIR=${ZS_DIR}/${P}
 # like e.g /usr/lib/python we do not store any user data there,
 # currently removed all custom permission stuff, for ${ZSERVDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure  --prefix="${D}${ZSERVDIR}" --with-python=/usr/bin/python2.4 || die "Failed to execute ./configure ..."
 	emake || die "Failed to compile."
@@ -53,12 +48,12 @@ src_install() {
 	docinto PLATFORMS ; dodoc Zope/doc/PLATFORMS/*
 	docinto ZEO ; dodoc Zope/doc/ZEO/*
 
-	make install prefix=${D}${ZSERVDIR} || die "Failed to install into ${D}${ZSERVDIR}"
-	rm -rf ${D}${ZSERVDIR}/doc
+	make install prefix="${D}"${ZSERVDIR} || die "Failed to install into ${D}${ZSERVDIR}"
+	rm -rf "${D}"${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 
 	# copy the init script skeleton to skel directory of our installation
-	cp ${FILESDIR}/zope.initd ${D}/${ZSERVDIR}/skel/zope.initd
+	cp "${FILESDIR}"/zope.initd "${D}"/${ZSERVDIR}/skel/zope.initd
 }
 
 src_test() {
diff --git a/net-zope/zope/zope-3.2.2.ebuild b/net-zope/zope/zope-3.2.2.ebuild
index 0acb4b2d4943..9b9eea193b45 100644
--- a/net-zope/zope/zope-3.2.2.ebuild
+++ b/net-zope/zope/zope-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.2.2.ebuild,v 1.1 2006/10/02 16:27:21 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.2.2.ebuild,v 1.2 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -30,16 +30,12 @@ ZINSTDIR=/var/lib/zope/${P}
 
 src_compile() {
 
-	cd ${S}
-
-	./configure --prefix=${D}${ZSERVDIR} --with-python=/usr/bin/python2.4 || die "Failed to configure."
+	./configure --prefix="${D}"${ZSERVDIR} --with-python=/usr/bin/python2.4 || die "Failed to configure."
 	emake || die "Failed to compile."
 }
 
 src_install() {
 
-	cd ${S}
-
 	dodoc README.txt
 	dodoc Zope/doc/*.txt
 	for DIR in schema security skins style zcml zsync
@@ -48,12 +44,12 @@ src_install() {
 	  dodoc Zope/doc/${DIR}/*
 	done
 
-	make install prefix=${D}${ZSERVDIR}
+	make install prefix="${D}"${ZSERVDIR}
 
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 
 	# copy the init script skeleton to zopeskel directory of our installation
-	cp ${FILESDIR}/zope.initd ${D}${ZSKELDIR}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${D}"${ZSKELDIR}/zope.initd
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-3.3.1.ebuild b/net-zope/zope/zope-3.3.1.ebuild
index 6d45f180580b..f1249f6d5901 100644
--- a/net-zope/zope/zope-3.3.1.ebuild
+++ b/net-zope/zope/zope-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.3.1.ebuild,v 1.2 2007/11/25 01:31:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.3.1.ebuild,v 1.3 2008/05/27 20:59:50 tupone Exp $
 
 inherit eutils multilib
 
@@ -30,16 +30,12 @@ ZINSTDIR=/var/lib/zope/${P}
 
 src_compile() {
 
-	cd ${S}
-
-	./configure --prefix=${D}${ZSERVDIR} --with-python=/usr/bin/python2.4 || die "Failed to configure."
+	./configure --prefix="${D}"${ZSERVDIR} --with-python=/usr/bin/python2.4 || die "Failed to configure."
 	emake || die "Failed to compile."
 }
 
 src_install() {
 
-	cd ${S}
-
 	dodoc README.txt
 	dodoc Zope/doc/*.txt
 	for DIR in schema security skins style zcml zsync
@@ -48,12 +44,12 @@ src_install() {
 	  dodoc Zope/doc/${DIR}/*
 	done
 
-	make install prefix=${D}${ZSERVDIR}
+	make install prefix="${D}"${ZSERVDIR}
 
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
 
 	# copy the init script skeleton to zopeskel directory of our installation
-	cp ${FILESDIR}/zope.initd ${D}${ZSKELDIR}/zope.initd
+	cp "${FILESDIR}"/zope.initd "${D}"${ZSKELDIR}/zope.initd
 }
 
 pkg_postinst() {