misc touchups

(Portage version: 2.1_pre3-r1)

25 files changed, 169 insertions, 189 deletions

diff --git a/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild b/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild
index 6054037730a5..c3849ee0f3d7 100644
--- a/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild
+++ b/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild
@@ -1,16 +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/abracadabraobject/abracadabraobject-1.5.1.ebuild,v 1.5 2004/06/25 01:17:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild,v 1.6 2006/01/27 02:23:30 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="This can add pre-configured ZOPE-objects to folders through ZMI."
+DESCRIPTION="This can add pre-configured ZOPE-objects to folders through ZMI"
 HOMEPAGE="http://www.zope.org/Members/mjablonski/AbracadabraObject"
 SRC_URI="${HOMEPAGE}/AbracadabraObject-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="x86"
+
 RDEPEND="net-zope/propertyfolder
-	net-zope/propertyobject
-	${RDEPEND}"
+	net-zope/propertyobject"
 
 ZPROD_LIST="AbracadabraObject"
diff --git a/net-zope/annotations/annotations-0.4.3.ebuild b/net-zope/annotations/annotations-0.4.3.ebuild
index e916878503b6..51a95e6d6143 100644
--- a/net-zope/annotations/annotations-0.4.3.ebuild
+++ b/net-zope/annotations/annotations-0.4.3.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/annotations/annotations-0.4.3.ebuild,v 1.4 2005/02/21 21:29:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/annotations/annotations-0.4.3.ebuild,v 1.5 2006/01/27 02:24:47 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Annotations is a generic way to add information to arbitrary Zope objects."
+DESCRIPTION="Annotations is a generic way to add information to arbitrary Zope objects"
 HOMEPAGE="http://www.infrae.com/download/Annotations"
 SRC_URI="${HOMEPAGE}/${PV}/Annotations-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
 
 ZPROD_LIST="Annotations"
diff --git a/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild b/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild
index 80eab61d4ca0..3965c6da8c17 100644
--- a/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild
+++ b/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild
@@ -1,22 +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/archetypes/archetypes-1.2.5_rc5.ebuild,v 1.3 2004/09/24 20:52:24 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild,v 1.4 2006/01/27 02:25:12 vapier Exp $
 
 inherit zproduct
 
 MY_P=Archetypes-1.2.5-rc5
-
 DESCRIPTION="Allows creation of new content types for Plone"
 HOMEPAGE="http://www.sourceforge.net/projects/${PN}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-IUSE=""
 SLOT="1.2"
+KEYWORDS="ppc x86"
 
 RDEPEND=">=net-zope/plone-1.0.1
-		net-zope/portaltransforms
-		${RDEPEND}"
+	net-zope/portaltransforms"
+
+S=${WORKDIR}/${MY_P}
 
 ZPROD_LIST="Archetypes ArchExample ArchGenXML generator validation"
diff --git a/net-zope/archetypes/archetypes-1.3.1.ebuild b/net-zope/archetypes/archetypes-1.3.1.ebuild
index b639acaaad5a..01fdd618fad7 100644
--- a/net-zope/archetypes/archetypes-1.3.1.ebuild
+++ b/net-zope/archetypes/archetypes-1.3.1.ebuild
@@ -1,30 +1,26 @@
-# 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/archetypes/archetypes-1.3.1.ebuild,v 1.3 2005/04/02 08:48:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/archetypes-1.3.1.ebuild,v 1.4 2006/01/27 02:25:12 vapier Exp $
 
 inherit zproduct
 
 MY_P=Archetypes-1.3.1-final
-
 DESCRIPTION="Allows creation of new content types for Plone"
-WEBPAGE="http://www.sourceforge.net/projects/${PN}"
+HOMEPAGE="http://www.sourceforge.net/projects/${PN}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
 SLOT="1.3"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=net-zope/cmf-1.4.7
-		 =net-zope/portaltransforms-1.3*
-		 =net-zope/generator-1.3*
-		 =net-zope/validation-1.3*
-		 =net-zope/mimetypesregistry-1.3*
-
-		${RDEPEND}"
+	 =net-zope/portaltransforms-1.3*
+	 =net-zope/generator-1.3*
+	 =net-zope/validation-1.3*
+	 =net-zope/mimetypesregistry-1.3*"
 
 ZPROD_LIST="Archetypes"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
 }
diff --git a/net-zope/archetypes/archetypes-1.3.2.ebuild b/net-zope/archetypes/archetypes-1.3.2.ebuild
index 1f139a083e75..8537a28d58fd 100644
--- a/net-zope/archetypes/archetypes-1.3.2.ebuild
+++ b/net-zope/archetypes/archetypes-1.3.2.ebuild
@@ -1,31 +1,26 @@
-# 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/archetypes/archetypes-1.3.2.ebuild,v 1.1 2005/04/15 17:04:53 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/archetypes-1.3.2.ebuild,v 1.2 2006/01/27 02:25:12 vapier Exp $
 
 inherit zproduct
 
 MY_P=Archetypes-${PV}-final
-
 DESCRIPTION="Allows creation of new content types for Plone"
-WEBPAGE="http://www.sourceforge.net/projects/archetypes/"
+HOMEPAGE="http://www.sourceforge.net/projects/archetypes/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-#http://mesh.dl.sourceforge.net/sourceforge/archetypes/Archetypes-1.3.2-final.tar.gz
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
 SLOT="1.3"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=net-zope/cmf-1.4.7
-		 =net-zope/portaltransforms-1.3*
-		 =net-zope/generator-1.3*
-		 =net-zope/validation-1.3*
-		 =net-zope/mimetypesregistry-1.3*
-
-		${RDEPEND}"
+	 =net-zope/portaltransforms-1.3*
+	 =net-zope/generator-1.3*
+	 =net-zope/validation-1.3*
+	 =net-zope/mimetypesregistry-1.3*"
 
 ZPROD_LIST="Archetypes"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
 }
diff --git a/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild b/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild
index aca082f168c8..34fe7b2f53a0 100644
--- a/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild
+++ b/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild
@@ -1,15 +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/atcontenttypes/atcontenttypes-0.2.0.ebuild,v 1.1 2005/03/26 02:11:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild,v 1.2 2006/01/27 02:25:39 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="AtContentTypes is a feature improved reimplementation of the
-default CMF/Plone content types using Archetypes."
+DESCRIPTION="feature improved reimplementation of the default CMF/Plone content types using Archetypes"
 HOMEPAGE="http://www.sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/ATContentTypes-${PV}-final.tar.gz"
+
 LICENSE="ZPL"
 KEYWORDS="~x86"
-IUSE=""
 
 ZPROD_LIST="ATContentTypes"
diff --git a/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild b/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild
index 86a818406578..212bac1aabe4 100644
--- a/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild
+++ b/net-zope/btreefolder2/btreefolder2-0.5.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/btreefolder2/btreefolder2-0.5.0.ebuild,v 1.8 2004/09/11 21:59:48 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild,v 1.9 2006/01/27 02:25:59 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Acts like a Zope folder but can store many more items."
+DESCRIPTION="Acts like a Zope folder but can store many more items"
 HOMEPAGE="http://hathaway.freezope.org/Software/BTreeFolder2/"
 SRC_URI="http://hathaway.freezope.org/Software/BTreeFolder2/BTreeFolder2-${PV}.tar.gz"
+
 LICENSE="ZPL"
 KEYWORDS="x86"
 
 ZPROD_LIST="BTreeFolder2"
-IUSE=""
diff --git a/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild b/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild
index a0de7655baec..27af4329a20c 100644
--- a/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild
+++ b/net-zope/btreefolder2/btreefolder2-1.0.1.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/btreefolder2/btreefolder2-1.0.1.ebuild,v 1.4 2005/04/02 08:49:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild,v 1.5 2006/01/27 02:25:59 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Acts like a Zope folder but can store many more items."
+DESCRIPTION="Acts like a Zope folder but can store many more items"
 HOMEPAGE="http://hathawaymix.org/Software/BTreeFolder2/"
 SRC_URI="http://hathawaymix.org/Software/BTreeFolder2/BTreeFolder2-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 ZPROD_LIST="BTreeFolder2"
-IUSE=""
diff --git a/net-zope/btreefolder2/btreefolder2-1.0.ebuild b/net-zope/btreefolder2/btreefolder2-1.0.ebuild
index 69b5602449eb..259722ce9f0a 100644
--- a/net-zope/btreefolder2/btreefolder2-1.0.ebuild
+++ b/net-zope/btreefolder2/btreefolder2-1.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/btreefolder2/btreefolder2-1.0.ebuild,v 1.3 2004/09/11 21:59:49 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-1.0.ebuild,v 1.4 2006/01/27 02:25:59 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Acts like a Zope folder but can store many more items."
+DESCRIPTION="Acts like a Zope folder but can store many more items"
 HOMEPAGE="http://hathaway.freezope.org/Software/BTreeFolder2/"
 SRC_URI="http://hathaway.freezope.org/Software/BTreeFolder2/BTreeFolder2-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="BTreeFolder2"
-IUSE=""
diff --git a/net-zope/calendarx/calendarx-0.4.15.ebuild b/net-zope/calendarx/calendarx-0.4.15.ebuild
index 3be8942486f2..36f882d16b41 100644
--- a/net-zope/calendarx/calendarx-0.4.15.ebuild
+++ b/net-zope/calendarx/calendarx-0.4.15.ebuild
@@ -1,24 +1,21 @@
-# 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/calendarx/calendarx-0.4.15.ebuild,v 1.1 2005/04/19 17:03:05 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/calendarx/calendarx-0.4.15.ebuild,v 1.2 2006/01/27 02:26:21 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CalendarX is a customizable calendar product for Plone."
+DESCRIPTION="CalendarX is a customizable calendar product for Plone"
 HOMEPAGE="http://calendarx.org/"
 SRC_URI="mirror://sourceforge/${PN}//CalendarX-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 DEPEND="=net-zope/plone-2.0*"
 
 ZPROD_LIST="CalendarX"
 
-src_install()
-{
+src_install() {
 	# We need to change directory name to versionless
 	mv ${ZPROD_LIST}-${PV} ${ZPROD_LIST}
 	zproduct_src_install
diff --git a/net-zope/calendarx/calendarx-0.6.0.ebuild b/net-zope/calendarx/calendarx-0.6.0.ebuild
index a986cdc4d4b6..e231c18edb10 100644
--- a/net-zope/calendarx/calendarx-0.6.0.ebuild
+++ b/net-zope/calendarx/calendarx-0.6.0.ebuild
@@ -1,24 +1,21 @@
-# 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/calendarx/calendarx-0.6.0.ebuild,v 1.2 2005/04/29 14:36:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/calendarx/calendarx-0.6.0.ebuild,v 1.3 2006/01/27 02:26:21 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CalendarX is a customizable calendar product for Plone."
+DESCRIPTION="CalendarX is a customizable calendar product for Plone"
 HOMEPAGE="http://calendarx.org/"
 SRC_URI="mirror://sourceforge/${PN}//CalendarX-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="=net-zope/plone-2.0*"
 
 ZPROD_LIST="CalendarX"
 
-src_install()
-{
+src_install() {
 	# We need to change directory name to versionless
 	mv ${ZPROD_LIST}-${PV} ${ZPROD_LIST}
 	zproduct_src_install
diff --git a/net-zope/cmf/cmf-1.3.2.ebuild b/net-zope/cmf/cmf-1.3.2.ebuild
index bcb3c483bb5e..84f869b7c6f7 100644
--- a/net-zope/cmf/cmf-1.3.2.ebuild
+++ b/net-zope/cmf/cmf-1.3.2.ebuild
@@ -1,20 +1,20 @@
-# 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/cmf/cmf-1.3.2.ebuild,v 1.7 2005/02/21 21:23:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.3.2.ebuild,v 1.8 2006/01/27 02:26:41 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Content Management Framework. Services for content-oriented portal sites."
-
-HOMEPAGE="http://cmf.zope.org/"
 MY_PN="CMF"
 MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Content Management Framework. Services for content-oriented portal sites"
+HOMEPAGE="http://cmf.zope.org/"
 SRC_URI="${HOMEPAGE}/download/${MY_P}/${MY_P}.tar.gz"
-SLOT=1.3
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+SLOT="1.3"
+KEYWORDS="~ppc x86"
+
+S=${WORKDIR}/${MY_P}
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic"
 MYDOC="*.txt ${MYDOC}"
-S=${WORKDIR}/${MY_P}
diff --git a/net-zope/cmf/cmf-1.4.4.ebuild b/net-zope/cmf/cmf-1.4.4.ebuild
index 6f9d53ef7322..5db4d0b2b011 100644
--- a/net-zope/cmf/cmf-1.4.4.ebuild
+++ b/net-zope/cmf/cmf-1.4.4.ebuild
@@ -1,20 +1,20 @@
-# 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/cmf/cmf-1.4.4.ebuild,v 1.2 2005/02/21 21:23:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.4.4.ebuild,v 1.3 2006/01/27 02:26:41 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Content Management Framework. Services for content-oriented portal sites."
-
-HOMEPAGE="http://cmf.zope.org/"
 MY_PN="CMF"
 MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Content Management Framework. Services for content-oriented portal sites"
+HOMEPAGE="http://cmf.zope.org/"
 SRC_URI="${HOMEPAGE}/download/${MY_P}/${MY_P}.tar.gz"
-SLOT=1.4
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+SLOT="1.4"
+KEYWORDS="~ppc ~x86"
+
+S=${WORKDIR}/${MY_P}
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow"
 MYDOC="*.txt ${MYDOC}"
-S=${WORKDIR}/${MY_P}
diff --git a/net-zope/cmf/cmf-1.4.7.ebuild b/net-zope/cmf/cmf-1.4.7.ebuild
index 8fa92c892b00..27ec28cb2d2e 100644
--- a/net-zope/cmf/cmf-1.4.7.ebuild
+++ b/net-zope/cmf/cmf-1.4.7.ebuild
@@ -1,20 +1,20 @@
-# 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/cmf/cmf-1.4.7.ebuild,v 1.4 2005/03/19 17:08:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.4.7.ebuild,v 1.5 2006/01/27 02:26:41 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Content Management Framework. Services for content-oriented portal sites."
-
-HOMEPAGE="http://cmf.zope.org/"
 MY_PN="CMF"
 MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Content Management Framework. Services for content-oriented portal sites"
+HOMEPAGE="http://cmf.zope.org/"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${MY_P}/${MY_P}.tar.gz"
-SLOT=1.4
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~amd64 ~sparc"
-IUSE=""
+SLOT="1.4"
+KEYWORDS="~amd64 ppc ~sparc x86"
+
+S=${WORKDIR}/${MY_P}
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow"
 MYDOC="*.txt ${MYDOC}"
-S=${WORKDIR}/${MY_P}
diff --git a/net-zope/cmf/cmf-1.5.0.ebuild b/net-zope/cmf/cmf-1.5.0.ebuild
index ed8be712239f..5dc906d6a39b 100644
--- a/net-zope/cmf/cmf-1.5.0.ebuild
+++ b/net-zope/cmf/cmf-1.5.0.ebuild
@@ -1,20 +1,20 @@
-# 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/cmf/cmf-1.5.0.ebuild,v 1.1 2005/03/26 14:49:01 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.5.0.ebuild,v 1.2 2006/01/27 02:26:41 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Content Management Framework. Services for content-oriented portal sites."
-
-HOMEPAGE="http://cmf.zope.org/"
 MY_PN="CMF"
 MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Content Management Framework. Services for content-oriented portal sites"
+HOMEPAGE="http://cmf.zope.org/"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${MY_P}/${MY_P}.tar.gz"
-SLOT=1.5
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
+SLOT="1.5"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow"
 MYDOC="*.txt ${MYDOC}"
-S=${WORKDIR}/${MY_P}
diff --git a/net-zope/cmf/cmf-1.5.1.ebuild b/net-zope/cmf/cmf-1.5.1.ebuild
index ae04804f4173..46b554ee0a92 100644
--- a/net-zope/cmf/cmf-1.5.1.ebuild
+++ b/net-zope/cmf/cmf-1.5.1.ebuild
@@ -1,20 +1,20 @@
-# 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/cmf/cmf-1.5.1.ebuild,v 1.1 2005/04/26 16:50:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.5.1.ebuild,v 1.2 2006/01/27 02:26:41 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Content Management Framework. Services for content-oriented portal sites."
-
-HOMEPAGE="http://cmf.zope.org/"
 MY_PN="CMF"
 MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Content Management Framework. Services for content-oriented portal sites"
+HOMEPAGE="http://cmf.zope.org/"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${MY_P}/${MY_P}.tar.gz"
-SLOT=1.5
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
+SLOT="1.5"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow"
 MYDOC="*.txt ${MYDOC}"
-S=${WORKDIR}/${MY_P}
diff --git a/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild b/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild
index 3bbe8ea15477..8a49b24a140d 100644
--- a/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild
+++ b/net-zope/cmfactionicons/cmfactionicons-0.9.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/cmfactionicons/cmfactionicons-0.9.ebuild,v 1.7 2005/04/02 08:50:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild,v 1.8 2006/01/27 02:27:01 vapier Exp $
 
 inherit zproduct
 
 MY_PN=CMFActionIcons
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="CMFActionIcons: icon mapping tool, factored for reuse."
+DESCRIPTION="CMFActionIcons: icon mapping tool, factored for reuse"
 HOMEPAGE="http://zope.org/Members/tseaver/CMFActionIcons/"
 SRC_URI="http://zope.org/Members/tseaver/${MY_PN}/${MY_PN}-${PV}/${MY_PN}-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
+
+S=${WORKDIR}/${MY_PN}-${PV}
 
 ZPROD_LIST="CMFActionIcons"
diff --git a/net-zope/cmfboard/cmfboard-1.4.3.ebuild b/net-zope/cmfboard/cmfboard-1.4.3.ebuild
index 62ce7d81ed64..2d07f462e135 100644
--- a/net-zope/cmfboard/cmfboard-1.4.3.ebuild
+++ b/net-zope/cmfboard/cmfboard-1.4.3.ebuild
@@ -1,18 +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/cmfboard/cmfboard-1.4.3.ebuild,v 1.4 2004/09/11 22:42:00 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/cmfboard-1.4.3.ebuild,v 1.5 2006/01/27 02:27:23 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope/CMF product which provides a forum"
 HOMEPAGE="http://www.cmfboard.org"
 SRC_URI="http://www.cmfboard.org/download/CMFBoard-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
+
 RDEPEND=">=net-zope/cmf-1.3.3
 	>=net-zope/plone-1.0.5
-	>=net-zope/archetypes-1.0.1
-	${RDEPEND}"
+	>=net-zope/archetypes-1.0.1"
 
 ZPROD_LIST="CMFBoard"
-IUSE=""
diff --git a/net-zope/cmfboard/cmfboard-2.1.2.ebuild b/net-zope/cmfboard/cmfboard-2.1.2.ebuild
index f44f108e9a8f..f53756b48e4a 100644
--- a/net-zope/cmfboard/cmfboard-2.1.2.ebuild
+++ b/net-zope/cmfboard/cmfboard-2.1.2.ebuild
@@ -1,18 +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/cmfboard/cmfboard-2.1.2.ebuild,v 1.1 2004/09/11 22:42:00 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/cmfboard-2.1.2.ebuild,v 1.2 2006/01/27 02:27:23 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope/CMF product which provides a forum"
 HOMEPAGE="http://www.cmfboard.org"
 SRC_URI="mirror://sourceforge/collective/CMFBoard-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
+
 RDEPEND=">=net-zope/cmf-1.4.4
 	>=net-zope/plone-2.0
-	>=net-zope/archetypes-1.2.5_rc4
-	${RDEPEND}"
+	>=net-zope/archetypes-1.2.5_rc4"
 
 ZPROD_LIST="CMFBoard"
-IUSE=""
diff --git a/net-zope/cmfboard/cmfboard-2.1.4.ebuild b/net-zope/cmfboard/cmfboard-2.1.4.ebuild
index f8079af0c6c9..0404ed037f7e 100644
--- a/net-zope/cmfboard/cmfboard-2.1.4.ebuild
+++ b/net-zope/cmfboard/cmfboard-2.1.4.ebuild
@@ -1,18 +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/cmfboard/cmfboard-2.1.4.ebuild,v 1.1 2005/04/15 16:12:40 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/cmfboard-2.1.4.ebuild,v 1.2 2006/01/27 02:27:23 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope/CMF product which provides a forum"
 HOMEPAGE="http://www.cmfboard.org"
 SRC_URI="mirror://sourceforge/collective/CMFBoard-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
+
 RDEPEND=">=net-zope/cmf-1.4.4
 	>=net-zope/plone-2.0
-	>=net-zope/archetypes-1.2.5_rc4
-	${RDEPEND}"
+	>=net-zope/archetypes-1.2.5_rc4"
 
 ZPROD_LIST="CMFBoard"
-IUSE=""
diff --git a/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild b/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild
index 831ea1d37e47..abc8ef7984f8 100644
--- a/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild
+++ b/net-zope/cmfcollectorng/cmfcollectorng-0.20.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/cmfcollectorng/cmfcollectorng-0.20.ebuild,v 1.8 2004/06/25 01:18:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild,v 1.9 2006/01/27 02:27:43 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Zope/CMF-based bugtracking system."
+DESCRIPTION="Zope/CMF-based bugtracking system"
 HOMEPAGE="http://www.zope.org/Members/ajung/CMFCollectorNG/Wiki/FrontPage"
 SRC_URI="mirror://sourceforge/cmfcollectorng/CMFCollectorNG-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-RDEPEND=">=net-zope/cmf-1.3
-	${RDEPEND}"
+KEYWORDS="~ppc x86"
+
+RDEPEND=">=net-zope/cmf-1.3"
 
 ZPROD_LIST="CMFCollectorNG"
 MYDOC="MIGRATION.txt ${MYDOC}"
 
-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/cmfformcontroller/cmfformcontroller-1.0.1.ebuild b/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild
index 59151ddb0154..4511e79b148e 100644
--- a/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild
+++ b/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild
@@ -1,18 +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/cmfformcontroller/cmfformcontroller-1.0.1.ebuild,v 1.3 2004/07/27 19:17:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild,v 1.4 2006/01/27 02:28:06 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CMFFormController replaces the portal_form form validation mechanism from Plone."
+DESCRIPTION="CMFFormController replaces the portal_form form validation mechanism from Plone"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/CMFFormController-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
-RDEPEND="${RDEPEND}
-	net-zope/cmf"
+RDEPEND="net-zope/cmf"
 
 ZPROD_LIST="CMFFormController"
diff --git a/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild b/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild
index f9e31b5cd657..c295bc52a4e4 100644
--- a/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild
+++ b/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild
@@ -1,18 +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/cmfformcontroller/cmfformcontroller-1.0.2.ebuild,v 1.1 2004/07/27 19:17:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild,v 1.2 2006/01/27 02:28:06 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CMFFormController replaces the portal_form form validation mechanism from Plone."
+DESCRIPTION="CMFFormController replaces the portal_form form validation mechanism from Plone"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/CMFFormController-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
-RDEPEND="${RDEPEND}
-	net-zope/cmf"
+RDEPEND="net-zope/cmf"
 
 ZPROD_LIST="CMFFormController"
diff --git a/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild b/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild
index e67c5dde1713..168202557301 100644
--- a/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild
+++ b/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.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/cmfformcontroller/cmfformcontroller-1.0.3.ebuild,v 1.4 2005/04/02 08:52:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild,v 1.5 2006/01/27 02:28:06 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="CMFFormController replaces the portal_form form validation mechanism from Plone."
+DESCRIPTION="CMFFormController replaces the portal_form form validation mechanism from Plone"
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/CMFFormController-${PV}-beta.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
-RDEPEND="${RDEPEND}
-	net-zope/cmf"
+RDEPEND="net-zope/cmf"
 
 ZPROD_LIST="CMFFormController"
diff --git a/net-zope/cmfforum/cmfforum-1.0.ebuild b/net-zope/cmfforum/cmfforum-1.0.ebuild
index c3997207c3d2..95bfcdad6d40 100644
--- a/net-zope/cmfforum/cmfforum-1.0.ebuild
+++ b/net-zope/cmfforum/cmfforum-1.0.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/cmfforum/cmfforum-1.0.ebuild,v 1.7 2004/06/25 01:18:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfforum/cmfforum-1.0.ebuild,v 1.8 2006/01/27 02:28:26 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/CMFForum-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-RDEPEND=">=net-zope/cmf-1.3
-	${RDEPEND}"
+KEYWORDS="~ppc x86"
+
+RDEPEND=">=net-zope/cmf-1.3"
 
 ZPROD_LIST="CMFForum"
 
-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."