misc touchups

(Portage version: 2.1_pre3-r1)

27 files changed, 176 insertions, 187 deletions

diff --git a/net-zope/cmfmember/cmfmember-1.0.ebuild b/net-zope/cmfmember/cmfmember-1.0.ebuild
index a05956a02e16..78f4b876e79a 100644
--- a/net-zope/cmfmember/cmfmember-1.0.ebuild
+++ b/net-zope/cmfmember/cmfmember-1.0.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/cmfmember-1.0.ebuild,v 1.1 2005/03/26 01:08:30 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/cmfmember-1.0.ebuild,v 1.2 2006/01/27 02:28:46 vapier Exp $
 
 inherit zproduct
 
+MY_PN="CMFMember"
 DESCRIPTION="CMFMember is a replacement for portal_memberdata for Zope/Plone member management"
 HOMEPAGE="http://sourceforge.net/projects/collective"
-MY_PN="CMFMember"
 SRC_URI="mirror://sourceforge/collective/${MY_PN}-${PV}-final.tar.gz"
+
 LICENSE="ZPL"
 KEYWORDS="~x86"
-IUSE=""
 
 RDEPEND=">=net-zope/cmf-1.4.7
-		>=net-zope/plone-2.0.3
-		>=net-zope/archetypes-1.3.0
-		${RDEPEND}"
-
-ZPROD_LIST="CMFMember"
-MYDOC="*.txt ${MYDOC}"
+	>=net-zope/plone-2.0.3
+	>=net-zope/archetypes-1.3.0"
 
 # ugly but upstreams tar balls don't contain versions
 S=${WORKDIR}
+
+ZPROD_LIST="CMFMember"
+MYDOC="*.txt ${MYDOC}"
diff --git a/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild b/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild
index fad1f0e4bfb6..e2e2b9c1441e 100644
--- a/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild
+++ b/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild,v 1.1 2005/02/25 14:43:15 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild,v 1.2 2006/01/27 02:28:46 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CMFMember is a replacement for portal_memberdata for Zope/Plone member management"
-HOMEPAGE="http://sourceforge.net/projects/collective"
 MY_PN="CMFMember"
 MY_P="${MY_PN}-${PV/_rc/rc}"
+DESCRIPTION="CMFMember is a replacement for portal_memberdata for Zope/Plone member management"
+HOMEPAGE="http://sourceforge.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/${MY_P}.tar.gz"
+
 LICENSE="ZPL"
 KEYWORDS="~x86"
-IUSE=""
 
 RDEPEND=">=net-zope/cmf-1.4.7
-		>=net-zope/plone-2.0.3
-		>=net-zope/archetypes-1.3.0
-		${RDEPEND}"
-
-ZPROD_LIST="CMFMember"
-MYDOC="*.txt ${MYDOC}"
+	>=net-zope/plone-2.0.3
+	>=net-zope/archetypes-1.3.0"
 
 # ugly but upstreams tar balls don't contain versions
 S=${WORKDIR}
+
+ZPROD_LIST="CMFMember"
+MYDOC="*.txt ${MYDOC}"
diff --git a/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild b/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild
index ec9876b3cd2c..b42cd05e7ef3 100644
--- a/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild
+++ b/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild,v 1.2 2004/06/25 01:18:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild,v 1.3 2006/01/27 02:29:06 vapier Exp $
 
 inherit zproduct
 
 MY_PV=0_2_1
-
 DESCRIPTION="Zope/CMF for handling OpenOffice documents"
 HOMEPAGE="http://www.zope.org/Members/longsleep/CMFOODocument"
 SRC_URI="http://www.zope.org/Members/longsleep/CMFOODocument/${PV}/CMFOODocument-${MY_PV}.tar.gz"
+
 LICENSE="ZPL"
 KEYWORDS="~x86"
+
 RDEPEND="net-zope/cmf
 	>=net-zope/plone-1.0.1
 	dev-libs/libxml2
-	dev-libs/libxslt
-	${RDEPEND}"
+	dev-libs/libxslt"
 
 ZPROD_LIST="CMFOODocument"
diff --git a/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild b/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild
index 1382aefd80c3..5995bbc15ead 100644
--- a/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild
+++ b/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild,v 1.2 2004/06/25 01:18:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild,v 1.3 2006/01/27 02:29:27 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CMFOpenflow, also known as: 'reflow' Activity based workflow, is an object oriented workflow engine."
+DESCRIPTION="CMFOpenflow, also known as: 'reflow' Activity based workflow, is an object oriented workflow engine"
 HOMEPAGE="http://www.reflab.com/community/Openprojects/CMFOpenflow/"
 SRC_URI="http://www.reflab.com/community/Openprojects/CMFOpenflow/Reflow.downloads/Reflow_${PV}"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 ZPROD_LIST="CMFOpenflow"
 
-src_unpack(){
-	tar -xzf ${DISTDIR}/Reflow_${PV}
+src_unpack() {
+	tar -xzf ${DISTDIR}/Reflow_${PV} || die
 }
diff --git a/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild b/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild
index c494790ced19..68cd6d4d08bc 100644
--- a/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild
+++ b/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild,v 1.2 2004/10/14 20:47:14 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild,v 1.3 2006/01/27 02:29:48 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Zope product to have photos."
+DESCRIPTION="Zope product to have photos"
 HOMEPAGE="http://sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFPhoto-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
+
 RDEPEND="dev-python/imaging
-		>=net-zope/cmf-1.3
-		>=net-zope/plone-1.0.1
-	    ${RDEPEND}"
-IUSE=""
+	>=net-zope/cmf-1.3
+	>=net-zope/plone-1.0.1"
 
 ZPROD_LIST="CMFPhoto"
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "if you run zope on python < 2.3 make sure you have dev-python/Imgeing-21 installed."
 	ewarn "Please use CMFQuickInstallerTool or read the documentation of this"
diff --git a/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild b/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild
index 2cc033a044b6..880e7a4c341b 100644
--- a/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild
+++ b/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild,v 1.2 2004/10/14 20:48:59 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild,v 1.3 2006/01/27 02:30:09 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Zope/CMF product to organize e-pics into hierarchical photo album."
+DESCRIPTION="Zope/CMF product to organize e-pics into hierarchical photo album"
 HOMEPAGE="http://sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFPhotoAlbum-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
+
 RDEPEND="=net-zope/cmfphoto-${PV}*
-	    >=net-zope/btreefolder2-0.5.0
-	    ${RDEPEND}"
-IUSE=""
+    >=net-zope/btreefolder2-0.5.0"
 
 ZPROD_LIST="CMFPhotoAlbum"
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "Please use CMFQuickInstallerTool or read the documentation of this"
 	ewarn "product for instruction on how to add this product to your CMF/Plone site."
diff --git a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild
index 7c4eeec435c8..1b0857168107 100644
--- a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild
+++ b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild,v 1.4 2004/07/27 19:24:37 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild,v 1.5 2006/01/27 02:30:30 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Makes it easy to install cmf/plone products."
+DESCRIPTION="Makes it easy to install cmf/plone products"
 HOMEPAGE="http://www.sf.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFQuickInstallerTool_${PV}.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-RDEPEND=">=net-zope/cmf-1.3
-	${RDEPEND}"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND=">=net-zope/cmf-1.3"
 
 ZPROD_LIST="CMFQuickInstallerTool"
diff --git a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild
index 3a33ee13a36d..1331906a3c93 100644
--- a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild
+++ b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild,v 1.4 2005/04/02 08:51:43 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild,v 1.5 2006/01/27 02:30:30 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Makes it easy to install cmf/plone products."
+DESCRIPTION="Makes it easy to install cmf/plone products"
 HOMEPAGE="http://www.sf.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFQuickInstallerTool-${PV}.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-IUSE=""
-RDEPEND=">=net-zope/cmf-1.3
-	${RDEPEND}"
+KEYWORDS="~amd64 ppc ~sparc x86"
+
+RDEPEND=">=net-zope/cmf-1.3"
 
 ZPROD_LIST="CMFQuickInstallerTool"
diff --git a/net-zope/coreblog/coreblog-0.6.ebuild b/net-zope/coreblog/coreblog-0.6.ebuild
index 6ca2a20ccfd4..7d19a20d30c1 100644
--- a/net-zope/coreblog/coreblog-0.6.ebuild
+++ b/net-zope/coreblog/coreblog-0.6.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-0.6.ebuild,v 1.3 2004/10/08 10:01:50 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-0.6.ebuild,v 1.4 2006/01/27 02:30:51 vapier Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
-
-DESCRIPTION="Blog/Weblog/Web Nikki system for Zope."
+DESCRIPTION="Blog/Weblog/Web Nikki system for Zope"
 HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog06b.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/coreblog/coreblog-1.0.ebuild b/net-zope/coreblog/coreblog-1.0.ebuild
index 86bc90932d86..6fb0acd5eddd 100644
--- a/net-zope/coreblog/coreblog-1.0.ebuild
+++ b/net-zope/coreblog/coreblog-1.0.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.0.ebuild,v 1.2 2004/10/14 20:52:19 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.0.ebuild,v 1.3 2006/01/27 02:30:51 vapier Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
-
-DESCRIPTION="Blog/Weblog/Web Nikki system for Zope."
+DESCRIPTION="Blog/Weblog/Web Nikki system for Zope"
 HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog10.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/coreblog/coreblog-1.11.ebuild b/net-zope/coreblog/coreblog-1.11.ebuild
index 7014e0045cd5..79cbcd69e6fe 100644
--- a/net-zope/coreblog/coreblog-1.11.ebuild
+++ b/net-zope/coreblog/coreblog-1.11.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.11.ebuild,v 1.1 2005/03/26 01:00:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.11.ebuild,v 1.2 2006/01/27 02:30:51 vapier Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
-
-DESCRIPTION="Blog/Weblog/Web Nikki system for Zope."
+DESCRIPTION="Blog/Weblog/Web Nikki system for Zope"
 HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog111.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/coreblog/coreblog-1.20.ebuild b/net-zope/coreblog/coreblog-1.20.ebuild
index 66754628591a..b4a1042f5a45 100644
--- a/net-zope/coreblog/coreblog-1.20.ebuild
+++ b/net-zope/coreblog/coreblog-1.20.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.20.ebuild,v 1.2 2005/10/18 02:30:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.20.ebuild,v 1.3 2006/01/27 02:30:51 vapier Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
-
-DESCRIPTION="Blog/Weblog/Web Nikki system for Zope."
+DESCRIPTION="Blog/Weblog/Web Nikki system for Zope"
 HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog12.tgz"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/cvsfile/cvsfile-0.9.0.ebuild b/net-zope/cvsfile/cvsfile-0.9.0.ebuild
index c5b1e71bb4f2..9f326952994c 100644
--- a/net-zope/cvsfile/cvsfile-0.9.0.ebuild
+++ b/net-zope/cvsfile/cvsfile-0.9.0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cvsfile/cvsfile-0.9.0.ebuild,v 1.4 2005/02/17 17:18:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cvsfile/cvsfile-0.9.0.ebuild,v 1.5 2006/01/27 02:31:12 vapier Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
-
-RESTRICT="nomirror"
-DESCRIPTION="CVSFile enables Zope content to be served out of files residing in CVS sandboxes, and provides access to common CVS functions through the web in the Zope Management Interface."
+DESCRIPTION="CVSFile enables Zope content to be served out of files residing in CVS sandboxes, and provides access to common CVS functions through the web in the Zope Management Interface"
 HOMEPAGE="http://zope.org/Members/arielpartners/CVSFile"
 SRC_URI="${HOMEPAGE}/${PV}/CVSFile-${NEW_PV}.zip"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-RDEPEND="net-zope/externalfile
-	${RDEPEND}"
-DEPEND="${DEPEND} app-arch/unzip"
+KEYWORDS="~ppc ~x86"
+RESTRICT="nomirror"
+
+RDEPEND="net-zope/externalfile"
+DEPEND="app-arch/unzip"
 
 ZPROD_LIST="CVSFile"
diff --git a/net-zope/epoz/epoz-0.8.0.ebuild b/net-zope/epoz/epoz-0.8.0.ebuild
index ca961e929711..18d30ef3d6f4 100644
--- a/net-zope/epoz/epoz-0.8.0.ebuild
+++ b/net-zope/epoz/epoz-0.8.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/epoz-0.8.0.ebuild,v 1.3 2004/09/11 21:53:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/epoz-0.8.0.ebuild,v 1.4 2006/01/27 02:31:32 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION=" Epoz allows you to edit Zope- or Plone-objects with a wysiwyg-editor. No plugins are required. You only have to use a recent browser (IE >= 5.5, Mozilla >= 1.3.1, Netscape >= 7.1) that supports Rich-Text-controls (called Midas for Mozilla)."
+DESCRIPTION=" Epoz allows you to edit Zope- or Plone-objects with a wysiwyg-editor. No plugins are required. You only have to use a recent browser (IE >= 5.5, Mozilla >= 1.3.1, Netscape >= 7.1) that supports Rich-Text-controls (called Midas for Mozilla)"
 HOMEPAGE="http://mjablonski.zope.de/Epoz"
 SRC_URI="http://mjablonski.zope.de/Epoz/releases/Epoz-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="Epoz"
-IUSE=""
diff --git a/net-zope/epoz/epoz-0.8.4.ebuild b/net-zope/epoz/epoz-0.8.4.ebuild
index 3041e66bde82..c01732f2eb0f 100644
--- a/net-zope/epoz/epoz-0.8.4.ebuild
+++ b/net-zope/epoz/epoz-0.8.4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/epoz-0.8.4.ebuild,v 1.4 2005/04/02 08:53:10 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/epoz-0.8.4.ebuild,v 1.5 2006/01/27 02:31:32 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION=" Epoz allows you to edit Zope- or Plone-objects with a wysiwyg-editor. No plugins are required. You only have to use a recent browser (IE >= 5.5, Mozilla >= 1.3.1, Netscape >= 7.1) that supports Rich-Text-controls (called Midas for Mozilla)."
+DESCRIPTION=" Epoz allows you to edit Zope- or Plone-objects with a wysiwyg-editor. No plugins are required. You only have to use a recent browser (IE >= 5.5, Mozilla >= 1.3.1, Netscape >= 7.1) that supports Rich-Text-controls (called Midas for Mozilla)"
 HOMEPAGE="http://mjablonski.zope.de/Epoz"
 SRC_URI="http://mjablonski.zope.de/Epoz/releases/Epoz-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 ZPROD_LIST="Epoz"
-IUSE=""
diff --git a/net-zope/externaleditor/externaleditor-0.7-r1.ebuild b/net-zope/externaleditor/externaleditor-0.7-r1.ebuild
index 5ce579dc2683..ee3d7ae32e85 100644
--- a/net-zope/externaleditor/externaleditor-0.7-r1.ebuild
+++ b/net-zope/externaleditor/externaleditor-0.7-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.7-r1.ebuild,v 1.4 2004/09/11 21:23:25 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.7-r1.ebuild,v 1.5 2006/01/27 02:31:53 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects."
+DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects"
 HOMEPAGE="http://www.zope.org/Members/Caseman/ExternalEditor/"
 SRC_URI="http://www.zope.org/Members/Caseman/ExternalEditor/${PV}/ExternalEditor-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="ExternalEditor"
diff --git a/net-zope/externaleditor/externaleditor-0.7.2.ebuild b/net-zope/externaleditor/externaleditor-0.7.2.ebuild
index 3145f9d3087f..0549e5a396e7 100644
--- a/net-zope/externaleditor/externaleditor-0.7.2.ebuild
+++ b/net-zope/externaleditor/externaleditor-0.7.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.7.2.ebuild,v 1.1 2004/09/11 21:23:25 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.7.2.ebuild,v 1.2 2006/01/27 02:31:53 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects."
+DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects"
 HOMEPAGE="http://www.zope.org/Members/Caseman/ExternalEditor/"
 SRC_URI="http://www.zope.org/Members/Caseman/ExternalEditor/${PV}/ExternalEditor-${PV}-src.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="ExternalEditor"
diff --git a/net-zope/externaleditor/externaleditor-0.8.ebuild b/net-zope/externaleditor/externaleditor-0.8.ebuild
index 28b54967d9f5..466e02bc3910 100644
--- a/net-zope/externaleditor/externaleditor-0.8.ebuild
+++ b/net-zope/externaleditor/externaleditor-0.8.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.8.ebuild,v 1.5 2005/05/06 14:54:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.8.ebuild,v 1.6 2006/01/27 02:31:53 vapier Exp $
 
 inherit zproduct
 
 MY_PN="ExternalEditor"
 MY_P="${MY_PN}-${PV}-src"
 MY_P2="zopeedit-${PV}-src"
-DESCRIPTION="Allows you to use your favorite editor(s) from ZMI."
+DESCRIPTION="Allows you to use your favorite editor(s) from ZMI"
 HOMEPAGE="http://www.zope.org/Members/Caseman/${MY_PN}/"
 SRC_URI_BASE="${HOMEPAGE}/${PV}"
 SRC_URI="${SRC_URI_BASE}/${MY_P}.tgz
 	${SRC_URI_BASE}/${MY_P2}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-IUSE=""
-ZPROD_LIST="${MY_PN}"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 # the base of teh application is in Python2.1, but zopeedit.py wants Python2.2
-RDEPEND="${RDEPEND}
-		>=dev-lang/python-2.2"
+RDEPEND=">=dev-lang/python-2.2"
+
+ZPROD_LIST="${MY_PN}"
 
 S_ZPROD=${WORKDIR}/${MY_PN}
 S_SRC=${WORKDIR}/${MY_P2}
@@ -36,8 +36,7 @@ src_unpack() {
 
 DOCDIR=/usr/share/doc/${PF}
 
-src_install()
-{
+src_install() {
 	S=${S_ZPROD} zproduct_src_install
 	mkdir -p ${T}${DOCDIR}/${MY_PN}
 	mv ${D}${DOCDIR}/* ${T}${DOCDIR}/${MY_PN}
@@ -52,8 +51,7 @@ src_install()
 	doins Plugins/*.py
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "To use the External Editor Zope Product you will need to manually"
 	ewarn "configure the helper application(/usr/bin/zopeedit.py) for your"
diff --git a/net-zope/externalfile/externalfile-1.2.0.ebuild b/net-zope/externalfile/externalfile-1.2.0.ebuild
index 96ab745f3d42..2fc30fc5f167 100644
--- a/net-zope/externalfile/externalfile-1.2.0.ebuild
+++ b/net-zope/externalfile/externalfile-1.2.0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/externalfile/externalfile-1.2.0.ebuild,v 1.6 2005/02/17 17:19:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externalfile/externalfile-1.2.0.ebuild,v 1.7 2006/01/27 02:32:13 vapier Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
-
-RESTRICT="nomirror"
-DESCRIPTION="ExternalFile extends Zope to work with files in the filesystem. You can create instances of ExternalFile that behave like standard Zope objects except that they get their contents from a file located anywhere in a Zope-accessible filesystem."
+DESCRIPTION="ExternalFile extends Zope to work with files in the filesystem. You can create instances of ExternalFile that behave like standard Zope objects except that they get their contents from a file located anywhere in a Zope-accessible filesystem"
 HOMEPAGE="http://www.zope.org/Members/arielpartners/ExternalFile"
 SRC_URI="${HOMEPAGE}/${PV}/ExternalFile-${NEW_PV}.zip"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-RDEPEND="net-zope/zope
-	${RDEPEND}"
-DEPEND="${DEPEND} app-arch/unzip"
+KEYWORDS="~ppc x86"
+RESTRICT="nomirror"
+
+RDEPEND="net-zope/zope"
+DEPEND="app-arch/unzip"
+
 ZPROD_LIST="ExternalFile"
-IUSE=""
diff --git a/net-zope/extfile/extfile-1.2.0_beta2.ebuild b/net-zope/extfile/extfile-1.2.0_beta2.ebuild
index 8809dc4009c1..a635ba95c5dd 100644
--- a/net-zope/extfile/extfile-1.2.0_beta2.ebuild
+++ b/net-zope/extfile/extfile-1.2.0_beta2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.2.0_beta2.ebuild,v 1.6 2004/10/23 22:44:34 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.2.0_beta2.ebuild,v 1.7 2006/01/27 02:32:33 vapier Exp $
 
 inherit zproduct
-PV_NEW=${PV/_beta/b}
 
+PV_NEW=${PV/_beta/b}
 DESCRIPTION="Zope proxy objects for files on the filesystem"
 HOMEPAGE="http://www.zope.org/Members/shh/ExtFile"
 SRC_URI="${HOMEPAGE}/ExtFile-${PV_NEW}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-RDEPEND=">=dev-python/imaging-1.1.3
-	${RDEPEND}"
+KEYWORDS="~ppc x86"
+
+RDEPEND=">=dev-python/imaging-1.1.3"
 
 ZPROD_LIST="ExtFile"
-IUSE=""
diff --git a/net-zope/extfile/extfile-1.4.2.ebuild b/net-zope/extfile/extfile-1.4.2.ebuild
index fb00554d0923..83f54835302b 100644
--- a/net-zope/extfile/extfile-1.4.2.ebuild
+++ b/net-zope/extfile/extfile-1.4.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.4.2.ebuild,v 1.1 2004/10/23 22:50:32 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.4.2.ebuild,v 1.2 2006/01/27 02:32:33 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope proxy objects for files on the filesystem"
 HOMEPAGE="http://www.zope.org/Members/shh/ExtFile"
 SRC_URI="${HOMEPAGE}/${PV}/ExtFile-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-RDEPEND=">=dev-python/imaging-1.1.3
-	${RDEPEND}"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND=">=dev-python/imaging-1.1.3"
 
 ZPROD_LIST="ExtFile"
-IUSE=""
diff --git a/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild b/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild
index 1daa2d8791f7..2deb05e73316 100644
--- a/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild
+++ b/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild,v 1.2 2004/06/25 01:20:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild,v 1.3 2006/01/27 02:32:54 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="allows authentication via alternative methods + mysql plain text auth patch"
 HOMEPAGE="http://exuserfolder.sf.net"
 SRC_URI="http://www.gentoo.at/distfiles/exuserfolder-0.2-s2upatch.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-RDEPEND="=net-zope/cmf-1.3*
-	>=net-zope/formulator-1.2.0
-	${RDEPEND}"
+KEYWORDS="~ppc ~x86"
 
-SLOT="0"
+RDEPEND="=net-zope/cmf-1.3*
+	>=net-zope/formulator-1.2.0"
 
 ZPROD_LIST="exUserFolder"
diff --git a/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild b/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild
index a31e0ca09087..78176a9cbd82 100644
--- a/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild
+++ b/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild,v 1.3 2004/06/25 01:20:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild,v 1.4 2006/01/27 02:32:54 vapier Exp $
 
 inherit zproduct
 
@@ -12,11 +12,13 @@ MY_P_DOWNLOAD="${MY_PN_DOWNLOAD}-${MY_PV}"
 DESCRIPTION="Extensible User Folder is a user folder that requires the authentication of users to be removed from the storage of properties of users"
 HOMEPAGE="http://www.zope.org/Members/TheJester/${MY_PN}"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_P_DOWNLOAD}.tgz"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+S=${WORKDIR}
+
 ZPROD_LIST="${MY_PN}"
-S="${WORKDIR}"
 MYDOC="${MYDOC} *.txt README.* LICENSE *.sql"
 
 src_install() {
@@ -27,4 +29,3 @@ src_install() {
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
-
diff --git a/net-zope/filesystemsite/filesystemsite-1.2.ebuild b/net-zope/filesystemsite/filesystemsite-1.2.ebuild
index e29ea840a8f5..77f3dfd6a757 100644
--- a/net-zope/filesystemsite/filesystemsite-1.2.ebuild
+++ b/net-zope/filesystemsite/filesystemsite-1.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/filesystemsite-1.2.ebuild,v 1.7 2005/02/21 21:23:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/filesystemsite-1.2.ebuild,v 1.8 2006/01/27 02:33:15 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Zope proxy objects for files on the filesystem."
+DESCRIPTION="Zope proxy objects for files on the filesystem"
 HOMEPAGE="http://www.zope.org/Members/k_vertigo/Products/FileSystemSite"
 SRC_URI="${HOMEPAGE}/FileSystemSite-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="FileSystemSite"
diff --git a/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild b/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild
index a4ff338f3799..092734bdfd8c 100644
--- a/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild
+++ b/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild,v 1.4 2005/05/04 12:59:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild,v 1.5 2006/01/27 02:33:15 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Zope proxy objects for files on the filesystem."
+DESCRIPTION="Zope proxy objects for files on the filesystem"
 HOMEPAGE="http://www.zope.org/Members/infrae/FileSystemSite"
 SRC_URI="${HOMEPAGE}/FileSystemSite-${PV}/FileSystemSite-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~amd64 ~ppc"
-IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
 
-RDEPEND=">=net-zope/cmf-1.4.2
-		${RDEPEND}"
+RDEPEND=">=net-zope/cmf-1.4.2"
 
 ZPROD_LIST="FileSystemSite"
diff --git a/net-zope/fle3/fle3-1.4.2.ebuild b/net-zope/fle3/fle3-1.4.2.ebuild
index d74e0317263e..696af6afe1f2 100644
--- a/net-zope/fle3/fle3-1.4.2.ebuild
+++ b/net-zope/fle3/fle3-1.4.2.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/fle3-1.4.2.ebuild,v 1.7 2004/10/23 22:36:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/fle3-1.4.2.ebuild,v 1.8 2006/01/27 02:33:35 vapier Exp $
 
 inherit zproduct
-P_NEW="fle_${PV}"
 
+P_NEW="fle_${PV}"
 DESCRIPTION="Future Learning Environment for collaborative learning"
 HOMEPAGE="http://fle3.uiah.fi/"
 SRC_URI="${HOMEPAGE}/download/${P_NEW}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-RDEPEND="dev-python/imaging
-	${RDEPEND}"
+KEYWORDS="~ppc x86"
+
+RDEPEND="dev-python/imaging"
 
 ZPROD_LIST="FLE"
-IUSE=""
diff --git a/net-zope/fle3/fle3-1.4.5.ebuild b/net-zope/fle3/fle3-1.4.5.ebuild
index 101e1f35d3ea..15c7f79dc633 100644
--- a/net-zope/fle3/fle3-1.4.5.ebuild
+++ b/net-zope/fle3/fle3-1.4.5.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/fle3-1.4.5.ebuild,v 1.1 2004/10/23 22:57:58 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/fle3-1.4.5.ebuild,v 1.2 2006/01/27 02:33:35 vapier Exp $
 
 inherit zproduct
-P_NEW="fle_${PV}"
 
+P_NEW="fle_${PV}"
 DESCRIPTION="Future Learning Environment for collaborative learning"
 HOMEPAGE="http://fle3.uiah.fi/"
 SRC_URI="${HOMEPAGE}/download/${P_NEW}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-RDEPEND="dev-python/imaging
-	${RDEPEND}"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND="dev-python/imaging"
 
 ZPROD_LIST="FLE"
-IUSE=""