misc touchups

(Portage version: 2.1_pre3-r1)

31 files changed, 244 insertions, 264 deletions

diff --git a/net-zope/neoboard/neoboard-1.1.ebuild b/net-zope/neoboard/neoboard-1.1.ebuild
index 4305f0d86d8d..349290ee784b 100644
--- a/net-zope/neoboard/neoboard-1.1.ebuild
+++ b/net-zope/neoboard/neoboard-1.1.ebuild
@@ -1,28 +1,27 @@
-# 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/neoboard/neoboard-1.1.ebuild,v 1.6 2004/06/25 01:22:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/neoboard/neoboard-1.1.ebuild,v 1.7 2006/01/27 02:39:05 vapier Exp $
 
 inherit zproduct
-P_NEW="NeoBoard-${PV}"
 
-DESCRIPTION="Threaded message boards w/articles, attachments, & i18n."
+P_NEW="NeoBoard-${PV}"
+DESCRIPTION="Threaded message boards w/articles, attachments, & i18n"
 HOMEPAGE="http://www.zoper.net/"
 SRC_URI="${HOMEPAGE}/Downloads/${P_NEW}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-RDEPEND="net-zope/neoportallibrary
-	${RDEPEND}"
+KEYWORDS="~ppc x86"
+
+RDEPEND="net-zope/neoportallibrary"
 
 ZPROD_LIST="NeoBoard"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	mv ${S}/${P_NEW} ${S}/NeoBoard
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "There are three different ways to add this product to your"
 	ewarn "Zope/CMF/Plone site. Please consult the documentation."
diff --git a/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild b/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild
index 22e6ff36ec20..0d2490603d3e 100644
--- a/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild
+++ b/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild
@@ -1,21 +1,21 @@
-# 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/neoportallibrary/neoportallibrary-0.9b.ebuild,v 1.5 2004/06/25 01:23:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild,v 1.6 2006/01/27 02:39:25 vapier Exp $
 
 inherit zproduct
-P_NEW="NeoPortalLibrary-${PV}"
 
-DESCRIPTION="Collection of modules to build Zope/CMF/Plone products."
+P_NEW="NeoPortalLibrary-${PV}"
+DESCRIPTION="Collection of modules to build Zope/CMF/Plone products"
 HOMEPAGE="http://www.zoper.net/"
 SRC_URI="${HOMEPAGE}/Downloads/${P_NEW}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="NeoPortalLibrary"
 MYDOC="doc/Developers_Guide.txt ${MYDOC}"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	mv ${S}/${P_NEW} ${S}/NeoPortalLibrary
 }
diff --git a/net-zope/parsedxml/parsedxml-1.4.ebuild b/net-zope/parsedxml/parsedxml-1.4.ebuild
index c916ec9d04e9..f66fa1ae5ab1 100644
--- a/net-zope/parsedxml/parsedxml-1.4.ebuild
+++ b/net-zope/parsedxml/parsedxml-1.4.ebuild
@@ -1,17 +1,17 @@
-# 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/parsedxml/parsedxml-1.4.ebuild,v 1.4 2005/02/21 21:32:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/parsedxml/parsedxml-1.4.ebuild,v 1.5 2006/01/27 02:39:45 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="XML objects for Zope."
+DESCRIPTION="XML objects for Zope"
 HOMEPAGE="http://www.infrae.com/download/ParsedXML"
 SRC_URI="${HOMEPAGE}/${PV}/ParsedXML-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
-RDEPEND=">=dev-python/pyxml-0.8.3
-	${RDEPEND}"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND=">=dev-python/pyxml-0.8.3"
 
 ZPROD_LIST="ParsedXML"
 MYDOC="README.DOMProxy README.parseprint ${MYDOC}"
diff --git a/net-zope/passwordresettool/passwordresettool-0.3.0.ebuild b/net-zope/passwordresettool/passwordresettool-0.3.0.ebuild
index 2b609183d669..c4fa6b424664 100644
--- a/net-zope/passwordresettool/passwordresettool-0.3.0.ebuild
+++ b/net-zope/passwordresettool/passwordresettool-0.3.0.ebuild
@@ -1,17 +1,17 @@
-# 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/passwordresettool/passwordresettool-0.3.0.ebuild,v 1.1 2005/12/24 14:06:00 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/passwordresettool/passwordresettool-0.3.0.ebuild,v 1.2 2006/01/27 02:40:05 vapier Exp $
 
 inherit zproduct
 
 MY_P="PasswordResetTool"
-DESCRIPTION="From the Plone Collective. Mandatory for changing Zope's encrypted user passwords."
+DESCRIPTION="From the Plone Collective. Mandatory for changing Zope's encrypted user passwords"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/${MY_P}-${PV}.tar.gz"
+
 LICENSE="ZPL"
 KEYWORDS="~x86"
 
 RDEPEND=">=net-zope/plone-2.0"
 
 ZPROD_LIST="${MY_P}"
-
diff --git a/net-zope/photo/photo-1.2.3.ebuild b/net-zope/photo/photo-1.2.3.ebuild
index 597d785b7504..712a897244b1 100644
--- a/net-zope/photo/photo-1.2.3.ebuild
+++ b/net-zope/photo/photo-1.2.3.ebuild
@@ -1,20 +1,18 @@
-# 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/photo/photo-1.2.3.ebuild,v 1.10 2005/05/08 04:58:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/photo/photo-1.2.3.ebuild,v 1.11 2006/01/27 02:40:29 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope product for managing photos and photo albums"
-
 HOMEPAGE="http://www.zope.org/Members/rbickers/Photo"
 SRC_URI="mirror://sourceforge/zopephoto/Photo-${PV}.tgz"
+
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc x86"
+
 RDEPEND="dev-python/imaging
-	media-gfx/imagemagick
-	${RDEPEND}"
+	media-gfx/imagemagick"
 
 ZPROD_LIST="Photo"
 MYDOC="FAQ.txt THANKS.txt UPGRADE.txt DEPENDENCIES.txt ${MYDOC}"
-IUSE=""
diff --git a/net-zope/photo/photo-1.2.4.ebuild b/net-zope/photo/photo-1.2.4.ebuild
index 1eab1b62ea1c..798c3b47642e 100644
--- a/net-zope/photo/photo-1.2.4.ebuild
+++ b/net-zope/photo/photo-1.2.4.ebuild
@@ -1,20 +1,18 @@
-# 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/photo/photo-1.2.4.ebuild,v 1.1 2005/08/28 13:10:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/photo/photo-1.2.4.ebuild,v 1.2 2006/01/27 02:40:29 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope product for managing photos and photo albums"
-
 HOMEPAGE="http://www.zope.org/Members/rbickers/Photo"
 SRC_URI="http://www.zope.org/Members/rbickers/Photo/Photo/Photo-${PV}.tgz"
+
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc ~x86"
+
 RDEPEND="dev-python/imaging
-	media-gfx/imagemagick
-	${RDEPEND}"
+	media-gfx/imagemagick"
 
 ZPROD_LIST="Photo"
 MYDOC="FAQ.txt THANKS.txt UPGRADE.txt DEPENDENCIES.txt ${MYDOC}"
-IUSE=""
diff --git a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild
index 283d61bbd98a..89ec511f9c76 100644
--- a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild
+++ b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.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/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild,v 1.4 2004/07/27 19:38:05 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild,v 1.5 2006/01/27 02:41:10 vapier Exp $
 
 inherit zproduct
 
 MY_P="1.0fork-rc3"
-
 DESCRIPTION="Translation service based on potfiles in the filesystem. (forked version)"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/PlacelessTranslationService-${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="PlacelessTranslationService"
diff --git a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild
index de18e6580c0e..3268414a0397 100644
--- a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild
+++ b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.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/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild,v 1.4 2005/04/02 08:55:32 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild,v 1.5 2006/01/27 02:41:10 vapier Exp $
 
 inherit zproduct
 
 MY_P="1.0fork-rc7"
-
 DESCRIPTION="Translation service based on potfiles in the filesystem. (forked version)"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/PlacelessTranslationService-${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 ZPROD_LIST="PlacelessTranslationService"
diff --git a/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild b/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild
index aa5fc7e51758..facc3b261e97 100644
--- a/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild
+++ b/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild
@@ -1,15 +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/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild,v 1.5 2004/09/24 20:38:16 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild,v 1.6 2006/01/27 02:40:49 vapier Exp $
 
 inherit zproduct
 
 MY_P=1.0fork-beta3
-
-DESCRIPTION="Translation service based on potfiles in the filesystem."
+DESCRIPTION="Translation service based on potfiles in the filesystem"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/PlacelessTranslationService-${MY_P}.tar.bz2"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="PlacelessTranslationService"
diff --git a/net-zope/plone/plone-1.0.5.ebuild b/net-zope/plone/plone-1.0.5.ebuild
index de4ead35292a..670be188d59d 100644
--- a/net-zope/plone/plone-1.0.5.ebuild
+++ b/net-zope/plone/plone-1.0.5.ebuild
@@ -1,33 +1,32 @@
-# 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/plone/plone-1.0.5.ebuild,v 1.7 2004/07/24 22:56:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.5.ebuild,v 1.8 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/CMFPlone-${PV}"
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/CMFPlone${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc x86"
+
 RDEPEND="=net-zope/cmf-1.3*
-	>=net-zope/formulator-1.2.0
-	${RDEPEND}"
+	>=net-zope/formulator-1.2.0"
+
+S=${WORKDIR}/CMFPlone-${PV}
 
 ZPROD_LIST="CMFPlone DCWorkflow"
 MYDOC="docs/NavigationTool.txt docs/SiteTypes.txt ${MYDOC}"
 
-src_install()
-{
+src_install() {
 	rm -R Formulator/
 	zproduct_src_install all
 }
 
 # Since i18n isn't a product folder, leaving it in $ZP_DIR/$PF.
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	einfo "---> NOTE: i18n folder location: ${ZP_DIR}/${PF}"
 }
diff --git a/net-zope/plone/plone-1.0.6.ebuild b/net-zope/plone/plone-1.0.6.ebuild
index d721c6ab19a0..97629487af69 100644
--- a/net-zope/plone/plone-1.0.6.ebuild
+++ b/net-zope/plone/plone-1.0.6.ebuild
@@ -1,33 +1,32 @@
-# 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/plone/plone-1.0.6.ebuild,v 1.1 2004/07/24 22:56:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.6.ebuild,v 1.2 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/CMFPlone-${PV}"
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/Plone-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+
 RDEPEND="=net-zope/cmf-1.3*
-	>=net-zope/formulator-1.2.0
-	${RDEPEND}"
+	>=net-zope/formulator-1.2.0"
+
+S=${WORKDIR}/CMFPlone-${PV}
 
 ZPROD_LIST="CMFPlone DCWorkflow"
 MYDOC="docs/NavigationTool.txt docs/SiteTypes.txt ${MYDOC}"
 
-src_install()
-{
+src_install() {
 	rm -R Formulator/
 	zproduct_src_install all
 }
 
 # Since i18n isn't a product folder, leaving it in $ZP_DIR/$PF.
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	einfo "---> NOTE: i18n folder location: ${ZP_DIR}/${PF}"
 }
diff --git a/net-zope/plone/plone-2.0.4.ebuild b/net-zope/plone/plone-2.0.4.ebuild
index dec861664720..8d119115684c 100644
--- a/net-zope/plone/plone-2.0.4.ebuild
+++ b/net-zope/plone/plone-2.0.4.ebuild
@@ -1,17 +1,17 @@
-# 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/plone/plone-2.0.4.ebuild,v 1.6 2005/11/14 13:38:11 seemant Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.4.ebuild,v 1.7 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
+SLOT="2.0"
+KEYWORDS="~amd64 ppc x86"
+
 RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/zope-2.7
 	>=net-zope/btreefolder2-1.0.1
@@ -27,7 +27,6 @@ RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/portaltransforms-1.0.4
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
-	>=app-admin/zope-config-0.4
-	${RDEPEND}"
+	>=app-admin/zope-config-0.4"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.5-r1.ebuild b/net-zope/plone/plone-2.0.5-r1.ebuild
index 682ba1338902..f8ed70c9a4f9 100644
--- a/net-zope/plone/plone-2.0.5-r1.ebuild
+++ b/net-zope/plone/plone-2.0.5-r1.ebuild
@@ -1,17 +1,17 @@
-# 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/plone/plone-2.0.5-r1.ebuild,v 1.4 2005/05/06 03:35:24 swegener Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5-r1.ebuild,v 1.5 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 RDEPEND="=net-zope/cmf-1.4*
 	=net-zope/zope-2.7*
 	>=net-zope/btreefolder2-1.0.1
@@ -28,7 +28,6 @@ RDEPEND="=net-zope/cmf-1.4*
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
 	>=app-admin/zope-config-0.5
-	>=dev-lang/python-2.3
-	${RDEPEND}"
+	>=dev-lang/python-2.3"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.5.ebuild b/net-zope/plone/plone-2.0.5.ebuild
index c88bb0bff051..22ec47026893 100644
--- a/net-zope/plone/plone-2.0.5.ebuild
+++ b/net-zope/plone/plone-2.0.5.ebuild
@@ -1,17 +1,17 @@
-# 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/plone/plone-2.0.5.ebuild,v 1.4 2005/05/06 03:35:24 swegener Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5.ebuild,v 1.5 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/zope-2.7
 	>=net-zope/btreefolder2-1.0.1
@@ -28,7 +28,6 @@ RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
 	>=app-admin/zope-config-0.5
-	>=dev-lang/python-2.3
-	${RDEPEND}"
+	>=dev-lang/python-2.3"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.ebuild b/net-zope/plone/plone-2.0.ebuild
index 1daeac5fb45f..5f2a7da96e06 100644
--- a/net-zope/plone/plone-2.0.ebuild
+++ b/net-zope/plone/plone-2.0.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/plone/plone-2.0.ebuild,v 1.3 2004/07/24 22:56:26 batlogg Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.ebuild,v 1.4 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-2.0-final.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="2.0"
 KEYWORDS="~x86"
-IUSE=""
+
 RDEPEND=">=net-zope/cmf-1.4.2
 	>=net-zope/btreefolder2-1.0
 	>=net-zope/cmfactionicons-0.9
@@ -25,7 +25,6 @@ RDEPEND=">=net-zope/cmf-1.4.2
 	>=net-zope/archetypes-1.2.5_rc4
 	>=net-zope/portaltransforms-1.0.3
 	>=net-zope/externaleditor-0.7
-	>=net-zope/epoz-0.8.0
-	${RDEPEND}"
+	>=net-zope/epoz-0.8.0"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild b/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild
index 282c262340a8..289a14dae677 100644
--- a/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild
+++ b/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild
@@ -1,16 +1,17 @@
-# 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/plonecollectorng/plonecollectorng-1.2.2.ebuild,v 1.3 2005/02/17 14:22:19 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild,v 1.4 2006/01/27 02:41:57 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="PCNG is a bugtracking system for Plone. It is based on the concepts and ideas of CMFCollector and CMFCollectorNG but it is a complete re-write"
 HOMEPAGE="http://www.zope.org/Members/ajung/PloneCollectorNG"
 SRC_URI="mirror://sourceforge/collective/PloneCollectorNG-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+
 RDEPEND=">=net-zope/plone-2.0.3
-		>=net-zope/archetypes-1.3.0_rc2
-		${RDEPEND}"
+	>=net-zope/archetypes-1.3.0_rc2"
+
 ZPROD_LIST="PloneCollectorNG"
diff --git a/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild b/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild
index 52e4d4abd87c..8ce245645e80 100644
--- a/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild
+++ b/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild
@@ -1,16 +1,17 @@
-# 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/plonecollectorng/plonecollectorng-1.2.3.ebuild,v 1.2 2005/02/17 14:22:19 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild,v 1.3 2006/01/27 02:41:57 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="PCNG is a bugtracking system for Plone. It is based on the concepts and ideas of CMFCollector and CMFCollectorNG but it is a complete re-write"
 HOMEPAGE="http://www.zope.org/Members/ajung/PloneCollectorNG"
 SRC_URI="mirror://sourceforge/collective/PloneCollectorNG-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+
 RDEPEND=">=net-zope/plone-2.0.3
-		>=net-zope/archetypes-1.3.0_rc2
-		${RDEPEND}"
+	>=net-zope/archetypes-1.3.0_rc2"
+
 ZPROD_LIST="PloneCollectorNG"
diff --git a/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild b/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild
index 68e9035d5857..075d1acacab3 100644
--- a/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild
+++ b/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild
@@ -1,16 +1,17 @@
-# 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/plonecollectorng/plonecollectorng-1.2.6.ebuild,v 1.2 2005/05/06 14:56:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild,v 1.3 2006/01/27 02:41:57 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="PCNG is a bugtracking system for Plone. It is based on the concepts and ideas of CMFCollector and CMFCollectorNG but it is a complete re-write"
 HOMEPAGE="http://www.zope.org/Members/ajung/PloneCollectorNG"
 SRC_URI="mirror://sourceforge/collective/PloneCollectorNG-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+
 RDEPEND=">=net-zope/plone-2.0
-		>=net-zope/archetypes-1.3
-		${RDEPEND}"
+	>=net-zope/archetypes-1.3"
+
 ZPROD_LIST="PloneCollectorNG"
diff --git a/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild b/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild
index a62a35ffa7f9..275507727fb1 100644
--- a/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild
+++ b/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.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/ploneerrorreporting/ploneerrorreporting-0.1.ebuild,v 1.3 2004/09/11 22:08:25 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild,v 1.4 2006/01/27 02:42:17 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="PloneErrorReporting replaces error messages with pages that facilitate the submission of useful bug reports."
+DESCRIPTION="PloneErrorReporting replaces error messages with pages that facilitate the submission of useful bug reports"
 HOMEPAGE="http://www.sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/PloneErrorReporting-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="PloneErrorReporting"
-IUSE=""
diff --git a/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild b/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild
index 59dd4dbfb31c..7c24915220ec 100644
--- a/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild
+++ b/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.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/ploneerrorreporting/ploneerrorreporting-0.11.ebuild,v 1.4 2005/04/02 08:58:16 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild,v 1.5 2006/01/27 02:42:17 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="PloneErrorReporting replaces error messages with pages that facilitate the submission of useful bug reports."
+DESCRIPTION="PloneErrorReporting replaces error messages with pages that facilitate the submission of useful bug reports"
 HOMEPAGE="http://www.sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/PloneErrorReporting-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 ZPROD_LIST="PloneErrorReporting"
-IUSE=""
diff --git a/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild b/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild
index 3529e5c64233..6e15473c1767 100644
--- a/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild
+++ b/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild
@@ -1,17 +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/plonelanguagetool/plonelanguagetool-0.5.ebuild,v 1.1 2005/04/19 17:14:12 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild,v 1.2 2006/01/27 02:42:37 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="PloneLanguageTool provides a language chooser for Plone."
+DESCRIPTION="PloneLanguageTool provides a language chooser for Plone"
 HOMEPAGE="http://www.sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/PloneLanguageTool-${PV}.tar.gz"
 
 LICENSE="GPL-1"
-SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 DEPEND="=net-zope/plone-2.0*"
 
diff --git a/net-zope/plonepopoll/plonepopoll-2.3.ebuild b/net-zope/plonepopoll/plonepopoll-2.3.ebuild
index 21dae6c0cbc6..231074d1aaf2 100644
--- a/net-zope/plonepopoll/plonepopoll-2.3.ebuild
+++ b/net-zope/plonepopoll/plonepopoll-2.3.ebuild
@@ -1,19 +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/plonepopoll/plonepopoll-2.3.ebuild,v 1.4 2005/12/24 13:14:17 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonepopoll/plonepopoll-2.3.ebuild,v 1.5 2006/01/27 02:42:57 vapier Exp $
 
 inherit zproduct
 
 MY_PN="PlonePopoll"
-
 DESCRIPTION="Plone product which provides multiple choice polls"
 HOMEPAGE="http://ingeniweb.sourceforge.net/Products/PlonePopoll/"
 SRC_URI="mirror://sourceforge/ingeniweb/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 DEPEND="=net-zope/plone-2.0*"
 
diff --git a/net-zope/plonetranslations/plonetranslations-0.1.ebuild b/net-zope/plonetranslations/plonetranslations-0.1.ebuild
index 116bd9f5b420..0e4a4136ff94 100644
--- a/net-zope/plonetranslations/plonetranslations-0.1.ebuild
+++ b/net-zope/plonetranslations/plonetranslations-0.1.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/plonetranslations/plonetranslations-0.1.ebuild,v 1.3 2004/09/11 22:32:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonetranslations/plonetranslations-0.1.ebuild,v 1.4 2006/01/27 02:43:17 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="This product contains the .po files for CMFPlone. PlacelessTranslationService reads the files and enables multilinguality."
+DESCRIPTION="This product contains the .po files for CMFPlone. PlacelessTranslationService reads the files and enables multilinguality"
 HOMEPAGE="http://www.sourceforge.net/projects/plone-i18n/"
 SRC_URI="mirror://sourceforge/plone-i18n/PloneTranslations-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="PloneTranslations"
-IUSE=""
diff --git a/net-zope/plonetranslations/plonetranslations-0.5.ebuild b/net-zope/plonetranslations/plonetranslations-0.5.ebuild
index 46d44382ebf0..02c8a7e6a1ca 100644
--- a/net-zope/plonetranslations/plonetranslations-0.5.ebuild
+++ b/net-zope/plonetranslations/plonetranslations-0.5.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/plonetranslations/plonetranslations-0.5.ebuild,v 1.4 2005/04/02 08:56:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonetranslations/plonetranslations-0.5.ebuild,v 1.5 2006/01/27 02:43:17 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="This product contains the .po files for CMFPlone. PlacelessTranslationService reads the files and enables multilinguality."
+DESCRIPTION="This product contains the .po files for CMFPlone. PlacelessTranslationService reads the files and enables multilinguality"
 HOMEPAGE="http://www.sourceforge.net/projects/plone-i18n/"
 SRC_URI="mirror://sourceforge/plone-i18n/PloneTranslations-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 ZPROD_LIST="PloneTranslations"
-IUSE=""
diff --git a/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild b/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild
index b4e5f08bcf85..e07dda5ffff8 100644
--- a/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild,v 1.6 2006/01/26 07:09:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild,v 1.7 2006/01/27 02:43:41 vapier Exp $
 
 inherit zproduct
 
@@ -10,26 +10,26 @@ MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tgz"
+
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-ZPROD_LIST="${MY_PN}"
-MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
+KEYWORDS="~ppc ~x86"
 
 DEPEND_BOTH="dev-python/docutils
-		www-client/lynx
-		app-text/poppler"
+	www-client/lynx
+	app-text/poppler"
 
-RDEPEND="${RDEPEND}
-		app-text/htmltidy
-		app-text/wv
-		dev-libs/libxslt
-		app-text/xlhtml
-		app-text/unrtf
-		${DEPEND_BOTH}"
+RDEPEND="app-text/htmltidy
+	app-text/wv
+	dev-libs/libxslt
+	app-text/xlhtml
+	app-text/unrtf
+	${DEPEND_BOTH}"
 
 S=${WORKDIR}/${MY_P}/${MY_PN}
 
+ZPROD_LIST="${MY_PN}"
+MYDOC="${MYDOC} TODO README ChangeLog"
+
 src_compile() {
 	python setup.py build
 }
diff --git a/net-zope/portaltransforms/portaltransforms-1.0.4-r1.ebuild b/net-zope/portaltransforms/portaltransforms-1.0.4-r1.ebuild
index 5a54882b958c..6937d911b0c8 100644
--- a/net-zope/portaltransforms/portaltransforms-1.0.4-r1.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.4-r1.ebuild,v 1.3 2006/01/26 07:09:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.4-r1.ebuild,v 1.4 2006/01/27 02:43:41 vapier Exp $
 
 inherit zproduct
 
@@ -10,26 +10,26 @@ MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tgz"
+
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-ZPROD_LIST="${MY_PN}"
-MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
+KEYWORDS="~ppc ~x86"
 
 DEPEND_BOTH="dev-python/docutils
-		www-client/lynx
-		app-text/poppler"
+	www-client/lynx
+	app-text/poppler"
 
-RDEPEND="${RDEPEND}
-		app-text/htmltidy
-		app-text/wv
-		dev-libs/libxslt
-		app-text/xlhtml
-		app-text/unrtf
-		${DEPEND_BOTH}"
+RDEPEND="app-text/htmltidy
+	app-text/wv
+	dev-libs/libxslt
+	app-text/xlhtml
+	app-text/unrtf
+	${DEPEND_BOTH}"
 
 S=${WORKDIR}/${MY_P}/${MY_PN}
 
+ZPROD_LIST="${MY_PN}"
+MYDOC="${MYDOC} TODO README ChangeLog"
+
 src_compile() {
 	python setup.py build
 }
diff --git a/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild b/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild
index 7249556fa06e..eccec75cd93d 100644
--- a/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild,v 1.5 2006/01/26 07:09:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild,v 1.6 2006/01/27 02:43:41 vapier Exp $
 
 inherit zproduct
 
@@ -10,26 +10,26 @@ MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tgz"
+
 LICENSE="GPL-1"
-KEYWORDS="x86 ppc"
-IUSE=""
-ZPROD_LIST="${MY_PN}"
-MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
+KEYWORDS="ppc x86"
 
 DEPEND_BOTH="dev-python/docutils
-		www-client/lynx
-		app-text/poppler"
+	www-client/lynx
+	app-text/poppler"
 
-RDEPEND="${RDEPEND}
-		app-text/htmltidy
-		app-text/wv
-		dev-libs/libxslt
-		app-text/xlhtml
-		app-text/unrtf
-		${DEPEND_BOTH}"
+RDEPEND="app-text/htmltidy
+	app-text/wv
+	dev-libs/libxslt
+	app-text/xlhtml
+	app-text/unrtf
+	${DEPEND_BOTH}"
 
 S=${WORKDIR}/${MY_P}/${MY_PN}
 
+ZPROD_LIST="${MY_PN}"
+MYDOC="${MYDOC} TODO README ChangeLog"
+
 src_compile() {
 	python setup.py build
 }
diff --git a/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild b/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild
index e119ab174750..76080ea18fac 100644
--- a/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild,v 1.5 2006/01/26 07:09:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild,v 1.6 2006/01/27 02:43:41 vapier Exp $
 
 inherit zproduct
 
@@ -9,27 +9,25 @@ MY_P="${MY_PN}-1.3.2-7"
 DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tar.gz"
+
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="1.3"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-ZPROD_LIST="${MY_PN}"
+RDEPEND=">=net-zope/cmf-1.4.7
+	app-text/htmltidy
+	app-text/wv
+	dev-libs/libxslt
+	app-text/xlhtml
+	app-text/unrtf
+	dev-python/docutils
+	www-client/lynx
+	app-text/poppler"
 
-MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
+ZPROD_LIST="${MY_PN}"
 
-RDEPEND=">=net-zope/cmf-1.4.7
-		app-text/htmltidy
-		app-text/wv
-		dev-libs/libxslt
-		app-text/xlhtml
-		app-text/unrtf
-		dev-python/docutils
-		www-client/lynx
-		app-text/poppler"
+MYDOC="${MYDOC} TODO README ChangeLog"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
 }
-
diff --git a/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild b/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild
index 6cdaa468cd39..49258f9c8d58 100644
--- a/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild,v 1.3 2006/01/26 07:09:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild,v 1.4 2006/01/27 02:43:41 vapier Exp $
 
 inherit zproduct
 
@@ -9,27 +9,25 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}-4.tgz"
+
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc"
 SLOT="1.3"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
-ZPROD_LIST="${MY_PN}"
+RDEPEND=">=net-zope/cmf-1.4.7
+	app-text/htmltidy
+	app-text/wv
+	dev-libs/libxslt
+	app-text/xlhtml
+	app-text/unrtf
+	dev-python/docutils
+	www-client/lynx
+	app-text/poppler"
 
-MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
+ZPROD_LIST="${MY_PN}"
 
-RDEPEND=">=net-zope/cmf-1.4.7
-		app-text/htmltidy
-		app-text/wv
-		dev-libs/libxslt
-		app-text/xlhtml
-		app-text/unrtf
-		dev-python/docutils
-		www-client/lynx
-		app-text/poppler"
+MYDOC="${MYDOC} TODO README ChangeLog"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
 }
-
diff --git a/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild b/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild
index 1e2fbd86825d..5dfd21f6d623 100644
--- a/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild,v 1.5 2006/01/26 07:09:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild,v 1.6 2006/01/27 02:43:41 vapier Exp $
 
 inherit zproduct
 
@@ -9,27 +9,25 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}-final.tar.gz"
+
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="1.3"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-ZPROD_LIST="${MY_PN}"
+RDEPEND=">=net-zope/cmf-1.4.7
+	app-text/htmltidy
+	app-text/wv
+	dev-libs/libxslt
+	app-text/xlhtml
+	app-text/unrtf
+	dev-python/docutils
+	www-client/lynx
+	app-text/poppler"
 
-MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
+ZPROD_LIST="${MY_PN}"
 
-RDEPEND=">=net-zope/cmf-1.4.7
-		app-text/htmltidy
-		app-text/wv
-		dev-libs/libxslt
-		app-text/xlhtml
-		app-text/unrtf
-		dev-python/docutils
-		www-client/lynx
-		app-text/poppler"
+MYDOC="${MYDOC} TODO README ChangeLog"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
 }
-
diff --git a/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild b/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild
index 85a3a4689bd7..a403c0ba9198 100644
--- a/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild
+++ b/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild
@@ -1,13 +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/propertyfolder/propertyfolder-1.3.3.ebuild,v 1.5 2004/06/25 01:24:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild,v 1.6 2006/01/27 02:44:02 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Intended mainly for use with PropertyObject and AbracadabraObject."
+DESCRIPTION="Intended mainly for use with PropertyObject and AbracadabraObject"
 HOMEPAGE="http://www.zope.org/Members/mjablonski/PropertyFolder"
 SRC_URI="${HOMEPAGE}/PropertyFolder-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="PropertyFolder"