misc touchups

(Portage version: 2.1_pre3-r1)

30 files changed, 179 insertions, 196 deletions

diff --git a/net-zope/propertyobject/propertyobject-1.3.3.ebuild b/net-zope/propertyobject/propertyobject-1.3.3.ebuild
index a00fb19d267a..70a39b07f716 100644
--- a/net-zope/propertyobject/propertyobject-1.3.3.ebuild
+++ b/net-zope/propertyobject/propertyobject-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/propertyobject/propertyobject-1.3.3.ebuild,v 1.5 2004/06/25 01:24:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyobject/propertyobject-1.3.3.ebuild,v 1.6 2006/01/27 02:44:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Intended mainly for use with PropertyFolder and AbracadabraObject."
+DESCRIPTION="Intended mainly for use with PropertyFolder and AbracadabraObject"
 HOMEPAGE="http://www.zope.org/Members/mjablonski/PropertyObject/"
 SRC_URI="${HOMEPAGE}/PropertyObject-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="PropertyObject"
diff --git a/net-zope/proxyindex/proxyindex-1.2.ebuild b/net-zope/proxyindex/proxyindex-1.2.ebuild
index 08712eff685a..5694bace961b 100644
--- a/net-zope/proxyindex/proxyindex-1.2.ebuild
+++ b/net-zope/proxyindex/proxyindex-1.2.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/proxyindex/proxyindex-1.2.ebuild,v 1.4 2005/02/21 21:26:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/proxyindex/proxyindex-1.2.ebuild,v 1.5 2006/01/27 02:44:42 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="ProxyIndex is a plugin to zope catalog index."
+DESCRIPTION="ProxyIndex is a plugin to zope catalog index"
 HOMEPAGE="http://www.infrae.com/download/ProxyIndex"
 SRC_URI="${HOMEPAGE}/${PV}/ProxyIndex-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
 
 ZPROD_LIST="ProxyIndex"
diff --git a/net-zope/silva/silva-0.9.1.2.ebuild b/net-zope/silva/silva-0.9.1.2.ebuild
index 97121686a78e..51c2be6e8fa4 100644
--- a/net-zope/silva/silva-0.9.1.2.ebuild
+++ b/net-zope/silva/silva-0.9.1.2.ebuild
@@ -1,18 +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/silva/silva-0.9.1.2.ebuild,v 1.5 2005/02/21 21:37:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-0.9.1.2.ebuild,v 1.6 2006/01/27 02:45:05 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="XML Publishing and authoring system"
 HOMEPAGE="http://www.zope.org/Members/faassen/Silva"
 SRC_URI="${HOMEPAGE}/Silva-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
+
 RDEPEND=">=net-zope/parsedxml-1.3.1
 	>=net-zope/formulator-1.3.1
 	>=net-zope/xmlwidgets-0.8.4
-	>=net-zope/filesystemsite-1.2
-	${RDEPEND}"
+	>=net-zope/filesystemsite-1.2"
 
 ZPROD_LIST="Silva"
diff --git a/net-zope/silva/silva-1.0.2.ebuild b/net-zope/silva/silva-1.0.2.ebuild
index 3adc9368944b..7abd4d39b9bf 100644
--- a/net-zope/silva/silva-1.0.2.ebuild
+++ b/net-zope/silva/silva-1.0.2.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/silva/silva-1.0.2.ebuild,v 1.2 2005/02/21 21:37:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-1.0.2.ebuild,v 1.3 2006/01/27 02:45:05 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Web based CMS for creating publications for the web, paper, and other media."
+DESCRIPTION="Web based CMS for creating publications for the web, paper, and other media"
 HOMEPAGE="http://www.infrae.com/download/Silva"
 SRC_URI="${HOMEPAGE}/${PV}/Silva-${PV}.tgz"
+
 LICENSE="ZPL"
 KEYWORDS="~x86"
-IUSE=""
-RDEPEND="
-	>=net-zope/annotations-0.4.3
+
+RDEPEND=">=net-zope/annotations-0.4.3
 	>=net-zope/proxyindex-1.2
 	>=net-zope/silvaviews-0.9
 	>=net-zope/silvametadata-0.8
@@ -19,7 +19,6 @@ RDEPEND="
 	>=net-zope/parsedxml-1.4
 	>=net-zope/formulator-1.6.2
 	>=net-zope/xmlwidgets-0.10.3
-	>=net-zope/filesystemsite-1.4.1
-	${RDEPEND}"
+	>=net-zope/filesystemsite-1.4.1"
 
 ZPROD_LIST="Silva"
diff --git a/net-zope/silva/silva-1.1-r1.ebuild b/net-zope/silva/silva-1.1-r1.ebuild
index a31def4c08f4..7015e5d9fe9a 100644
--- a/net-zope/silva/silva-1.1-r1.ebuild
+++ b/net-zope/silva/silva-1.1-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/silva/silva-1.1-r1.ebuild,v 1.3 2005/02/21 21:37:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-1.1-r1.ebuild,v 1.4 2006/01/27 02:45:05 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Web based CMS for creating publications for the web, paper, and other media."
+DESCRIPTION="Web based CMS for creating publications for the web, paper, and other media"
 HOMEPAGE="http://www.infrae.com/download/Silva"
 SRC_URI="${HOMEPAGE}/${PV}/Silva-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-RDEPEND="
-	>=net-zope/annotations-0.4.3
+KEYWORDS="~amd64 x86"
+
+RDEPEND=">=net-zope/annotations-0.4.3
 	>=net-zope/proxyindex-1.2
 	>=net-zope/silvadocument-1.1
 	>=net-zope/silvaviews-0.9
@@ -20,7 +20,6 @@ RDEPEND="
 	>=net-zope/parsedxml-1.4
 	>=net-zope/formulator-1.6.2
 	>=net-zope/xmlwidgets-0.10.3
-	>=net-zope/filesystemsite-1.4.1
-	${RDEPEND}"
+	>=net-zope/filesystemsite-1.4.1"
 
 ZPROD_LIST="Silva"
diff --git a/net-zope/silva/silva-1.2.ebuild b/net-zope/silva/silva-1.2.ebuild
index 9997be27d47e..a95685f84346 100644
--- a/net-zope/silva/silva-1.2.ebuild
+++ b/net-zope/silva/silva-1.2.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/silva/silva-1.2.ebuild,v 1.2 2005/05/04 13:10:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-1.2.ebuild,v 1.3 2006/01/27 02:45:05 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Web based CMS for creating publications for the web, paper, and other media."
+DESCRIPTION="Web based CMS for creating publications for the web, paper, and other media"
 HOMEPAGE="http://www.infrae.com/download/Silva"
 SRC_URI="${HOMEPAGE}/${PV}/Silva-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-RDEPEND="
-	>=net-zope/annotations-0.4.3
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=net-zope/annotations-0.4.3
 	>=net-zope/proxyindex-1.2
 	>=net-zope/silvadocument-1.2
 	>=net-zope/silvaviews-0.10
@@ -20,7 +20,6 @@ RDEPEND="
 	>=net-zope/parsedxml-1.4
 	>=net-zope/formulator-1.8.0
 	>=net-zope/xmlwidgets-0.11
-	>=net-zope/filesystemsite-1.4.1
-	${RDEPEND}"
+	>=net-zope/filesystemsite-1.4.1"
 
 ZPROD_LIST="Silva"
diff --git a/net-zope/silvadocument/silvadocument-1.1.5.ebuild b/net-zope/silvadocument/silvadocument-1.1.5.ebuild
index cebe3c2696f3..649f8959d5a3 100644
--- a/net-zope/silvadocument/silvadocument-1.1.5.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.1.5.ebuild
@@ -1,15 +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/silvadocument/silvadocument-1.1.5.ebuild,v 1.1 2005/05/08 19:23:33 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.1.5.ebuild,v 1.2 2006/01/27 02:45:25 vapier Exp $
 
 inherit zproduct
 
 MY_PN="SilvaDocument"
-DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva."
+DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva"
 HOMEPAGE="http://www.infrae.com/download/SilvaDocument/"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_PN}-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/silvadocument/silvadocument-1.1.ebuild b/net-zope/silvadocument/silvadocument-1.1.ebuild
index deaa94d00771..917ce10d2ced 100644
--- a/net-zope/silvadocument/silvadocument-1.1.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.1.ebuild
@@ -1,15 +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/silvadocument/silvadocument-1.1.ebuild,v 1.3 2005/02/21 21:33:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.1.ebuild,v 1.4 2006/01/27 02:45:25 vapier Exp $
 
 inherit zproduct
 
 MY_PN="SilvaDocument"
-DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva."
+DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva"
 HOMEPAGE="http://www.infrae.com/download/${MY_PN}/"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_PN}-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~amd64"
-IUSE=""
+KEYWORDS="~amd64 x86"
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/silvadocument/silvadocument-1.2.1.ebuild b/net-zope/silvadocument/silvadocument-1.2.1.ebuild
index 5b75baa3dbfd..49dd2e3e9876 100644
--- a/net-zope/silvadocument/silvadocument-1.2.1.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.2.1.ebuild
@@ -1,15 +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/silvadocument/silvadocument-1.2.1.ebuild,v 1.1 2005/05/08 19:23:33 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.2.1.ebuild,v 1.2 2006/01/27 02:45:25 vapier Exp $
 
 inherit zproduct
 
 MY_PN="SilvaDocument"
-DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva."
+DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva"
 HOMEPAGE="http://www.infrae.com/download/SilvaDocument/"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_PN}-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/silvadocument/silvadocument-1.2.ebuild b/net-zope/silvadocument/silvadocument-1.2.ebuild
index 42974ff00151..adfd83a4ee3b 100644
--- a/net-zope/silvadocument/silvadocument-1.2.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.2.ebuild
@@ -1,15 +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/silvadocument/silvadocument-1.2.ebuild,v 1.2 2005/05/04 13:08:46 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.2.ebuild,v 1.3 2006/01/27 02:45:25 vapier Exp $
 
 inherit zproduct
 
 MY_PN="SilvaDocument"
-DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva."
+DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, for net-zope/silva"
 HOMEPAGE="http://www.infrae.com/download/SilvaDocument/"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_PN}-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/silvametadata/silvametadata-0.8.ebuild b/net-zope/silvametadata/silvametadata-0.8.ebuild
index 444a895a953e..e976dc1a097f 100644
--- a/net-zope/silvametadata/silvametadata-0.8.ebuild
+++ b/net-zope/silvametadata/silvametadata-0.8.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/silvametadata/silvametadata-0.8.ebuild,v 1.4 2005/02/21 21:27:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvametadata/silvametadata-0.8.ebuild,v 1.5 2006/01/27 02:45:45 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Silva Metadata can be used to create metadata sets and associate these with Zope object types."
+DESCRIPTION="Silva Metadata can be used to create metadata sets and associate these with Zope object types"
 HOMEPAGE="http://www.infrae.com/download/SilvaMetadata"
 SRC_URI="${HOMEPAGE}/${PV}/SilvaMetadata-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
 
 ZPROD_LIST="SilvaMetadata"
diff --git a/net-zope/silvaviews/silvaviews-0.10.ebuild b/net-zope/silvaviews/silvaviews-0.10.ebuild
index a8432b6b6dc3..5db93fcc5f85 100644
--- a/net-zope/silvaviews/silvaviews-0.10.ebuild
+++ b/net-zope/silvaviews/silvaviews-0.10.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/silvaviews/silvaviews-0.10.ebuild,v 1.1 2005/03/28 15:59:10 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvaviews/silvaviews-0.10.ebuild,v 1.2 2006/01/27 02:46:05 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="SilvaViews is a component that is used by Silva to attach views to objects."
+DESCRIPTION="SilvaViews is a component that is used by Silva to attach views to objects"
 HOMEPAGE="http://www.infrae.com/download/SilvaViews"
 SRC_URI="${HOMEPAGE}/${PV}/SilvaViews-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
 ZPROD_LIST="SilvaViews"
diff --git a/net-zope/silvaviews/silvaviews-0.9.ebuild b/net-zope/silvaviews/silvaviews-0.9.ebuild
index 9744554abd79..0c39f72b50b8 100644
--- a/net-zope/silvaviews/silvaviews-0.9.ebuild
+++ b/net-zope/silvaviews/silvaviews-0.9.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/silvaviews/silvaviews-0.9.ebuild,v 1.4 2005/02/21 21:34:47 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvaviews/silvaviews-0.9.ebuild,v 1.5 2006/01/27 02:46:05 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="SilvaViews is a component that is used by Silva to attach views to objects."
+DESCRIPTION="SilvaViews is a component that is used by Silva to attach views to objects"
 HOMEPAGE="http://www.infrae.com/download/SilvaViews"
 SRC_URI="${HOMEPAGE}/${PV}/SilvaViews-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
 
 ZPROD_LIST="SilvaViews"
diff --git a/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild b/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild
index 81f0ab8de32b..0b1af4e3a8d9 100644
--- a/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild
+++ b/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild
@@ -1,20 +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/simpleuserfolder/simpleuserfolder-0.9.0.ebuild,v 1.3 2004/06/25 01:25:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild,v 1.4 2006/01/27 02:46:25 vapier Exp $
 
 inherit zproduct
 
 MY_PN="SimpleUserFolder"
 MY_PV="${PV//./-}"
 MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="This is a User Folder replacement that will let you customize the source of users and roles for a particular folder or complete Zope instance."
+DESCRIPTION="This is a User Folder replacement that will let you customize the source of users and roles for a particular folder or complete Zope instance"
 HOMEPAGE="http://www.zope.org/Members/NIP/${MY_PN}"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+S=${WORKDIR}
+
 ZPROD_LIST="${MY_PN}"
-S="${WORKDIR}"
 MYDOC="${MYDOC} *.txt"
 
 src_install() {
@@ -25,4 +27,3 @@ src_install() {
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
-
diff --git a/net-zope/speedpack/speedpack-0.3.ebuild b/net-zope/speedpack/speedpack-0.3.ebuild
index d85607679639..fa70dae60b51 100644
--- a/net-zope/speedpack/speedpack-0.3.ebuild
+++ b/net-zope/speedpack/speedpack-0.3.ebuild
@@ -1,6 +1,6 @@
-# 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/speedpack/speedpack-0.3.ebuild,v 1.1 2005/05/14 12:25:50 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/speedpack/speedpack-0.3.ebuild,v 1.2 2006/01/27 02:46:46 vapier Exp $
 
 inherit zproduct
 
@@ -10,11 +10,8 @@ SRC_URI="mirror://sourceforge/collective/SpeedPack-${PV}.tar.gz"
 
 LICENSE="ZPL"
 KEYWORDS="~x86"
-SLOT="0"
-IUSE=""
 
 DEPEND="dev-python/psyco"
 RDEPEND=""
 
 ZPROD_LIST="SpeedPack"
-
diff --git a/net-zope/sprout/sprout-0.5.1.ebuild b/net-zope/sprout/sprout-0.5.1.ebuild
index 9252bd12c180..fe4551bcd110 100644
--- a/net-zope/sprout/sprout-0.5.1.ebuild
+++ b/net-zope/sprout/sprout-0.5.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/sprout/sprout-0.5.1.ebuild,v 1.1 2005/04/24 13:00:02 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/sprout-0.5.1.ebuild,v 1.2 2006/01/27 02:47:06 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Python library which contains reusable components (XML related)."
+DESCRIPTION="Python library which contains reusable components (XML related)"
 HOMEPAGE="http://www.infrae.com/download/Sprout"
 SRC_URI="${HOMEPAGE}/${PV}/Sprout-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
 ZPROD_LIST="Sprout"
diff --git a/net-zope/sprout/sprout-0.5.ebuild b/net-zope/sprout/sprout-0.5.ebuild
index 7dbe0d36cf69..935161aa6d36 100644
--- a/net-zope/sprout/sprout-0.5.ebuild
+++ b/net-zope/sprout/sprout-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/sprout/sprout-0.5.ebuild,v 1.4 2005/02/21 21:30:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/sprout-0.5.ebuild,v 1.5 2006/01/27 02:47:06 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Python library which contains reusable components (XML related)."
+DESCRIPTION="Python library which contains reusable components (XML related)"
 HOMEPAGE="http://www.infrae.com/download/Sprout"
 SRC_URI="${HOMEPAGE}/${PV}/Sprout-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
 
 ZPROD_LIST="Sprout"
diff --git a/net-zope/sprout/sprout-0.6.1.ebuild b/net-zope/sprout/sprout-0.6.1.ebuild
index 16e5bb5c2ca5..07718fa3654c 100644
--- a/net-zope/sprout/sprout-0.6.1.ebuild
+++ b/net-zope/sprout/sprout-0.6.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/sprout/sprout-0.6.1.ebuild,v 1.1 2005/03/28 15:50:35 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/sprout-0.6.1.ebuild,v 1.2 2006/01/27 02:47:06 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Python library which contains reusable components (XML related)."
+DESCRIPTION="Python library which contains reusable components (XML related)"
 HOMEPAGE="http://www.infrae.com/download/Sprout"
 SRC_URI="${HOMEPAGE}/${PV}/Sprout-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
 ZPROD_LIST="Sprout"
diff --git a/net-zope/squishdot/squishdot-1.5.0-r1.ebuild b/net-zope/squishdot/squishdot-1.5.0-r1.ebuild
index 5b8642b61590..32c630121bfd 100644
--- a/net-zope/squishdot/squishdot-1.5.0-r1.ebuild
+++ b/net-zope/squishdot/squishdot-1.5.0-r1.ebuild
@@ -1,21 +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/squishdot/squishdot-1.5.0-r1.ebuild,v 1.1 2005/05/08 03:03:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/squishdot/squishdot-1.5.0-r1.ebuild,v 1.2 2006/01/27 02:47:26 vapier Exp $
 
 inherit zproduct
-NEW_PV="${PV//./-}"
 
-DESCRIPTION="A web-based news publishing and discussion product for Zope."
+NEW_PV="${PV//./-}"
+DESCRIPTION="A web-based news publishing and discussion product for Zope"
 HOMEPAGE="http://squishdot.org/"
 SRC_URI="${HOMEPAGE}/Download/Squishdot-${NEW_PV}.tar.gz"
-LICENSE="ZPL"
 
-KEYWORDS="x86 ~sparc"
-IUSE=""
+LICENSE="ZPL"
+KEYWORDS="~sparc x86"
 
 ZPROD_LIST="Squishdot"
-MYDOC="License.txt Changes.txt Credits.txt ${MYDOC}"
-
-
-
-
+MYDOC="Changes.txt Credits.txt ${MYDOC}"
diff --git a/net-zope/squishdot/squishdot-1.5.0.ebuild b/net-zope/squishdot/squishdot-1.5.0.ebuild
index 9add3a3d947c..d61303eddf10 100644
--- a/net-zope/squishdot/squishdot-1.5.0.ebuild
+++ b/net-zope/squishdot/squishdot-1.5.0.ebuild
@@ -1,21 +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/squishdot/squishdot-1.5.0.ebuild,v 1.6 2005/05/08 03:03:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/squishdot/squishdot-1.5.0.ebuild,v 1.7 2006/01/27 02:47:26 vapier Exp $
 
 inherit zproduct
-NEW_PV="${PV//./-}"
 
-DESCRIPTION="A web-based news publishing and discussion product for Zope."
+NEW_PV="${PV//./-}"
+DESCRIPTION="A web-based news publishing and discussion product for Zope"
 HOMEPAGE="http://squishdot.org/"
 SRC_URI="${HOMEPAGE}/Download/Squishdot-${NEW_PV}.tar.gz"
-LICENSE="ZPL"
-IUSE=""
 
+LICENSE="ZPL"
 KEYWORDS="x86"
 
 ZPROD_LIST="Squishdot"
-MYDOC="License.txt Changes.txt Credits.txt ${MYDOC}"
-
-
-
-
+MYDOC="Changes.txt Credits.txt ${MYDOC}"
diff --git a/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild b/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild
index 631c43cdee01..877f2ae30437 100644
--- a/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild
+++ b/net-zope/tinytableplus/tinytableplus-0.9-r1.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/tinytableplus/tinytableplus-0.9-r1.ebuild,v 1.1 2005/05/08 02:56:13 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild,v 1.2 2006/01/27 02:47:46 vapier Exp $
 
 inherit zproduct
-NEW_PV="${PV//./-}"
 
+NEW_PV="${PV//./-}"
 DESCRIPTION="TinyTable (a product designed to manage a small amount of tabular dat) with update capability"
 HOMEPAGE="http://www.zope.org/Members/hathawsh/TinyTablePlus"
 SRC_URI="${HOMEPAGE}/default/TinyTablePlus-${PV}.tgz"
-S=${WORKDIR}/lib/python/Products
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~sparc"
-IUSE=""
+KEYWORDS="~sparc x86"
+
+S=${WORKDIR}/lib/python/Products
 
 ZPROD_LIST="TinyTablePlus"
diff --git a/net-zope/tinytableplus/tinytableplus-0.9.ebuild b/net-zope/tinytableplus/tinytableplus-0.9.ebuild
index a6244229ff20..36147ea4b302 100644
--- a/net-zope/tinytableplus/tinytableplus-0.9.ebuild
+++ b/net-zope/tinytableplus/tinytableplus-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/tinytableplus/tinytableplus-0.9.ebuild,v 1.4 2005/05/08 02:56:13 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/tinytableplus/tinytableplus-0.9.ebuild,v 1.5 2006/01/27 02:47:46 vapier Exp $
 
 inherit zproduct
-NEW_PV="${PV//./-}"
 
+NEW_PV="${PV//./-}"
 DESCRIPTION="TinyTable (a product designed to manage a small amount of tabular dat) with update capability"
 HOMEPAGE="http://www.zope.org/Members/hathawsh/TinyTablePlus"
 SRC_URI="${HOMEPAGE}/default/TinyTablePlus-${PV}.tgz"
-S=${WORKDIR}/lib/python/Products
+
 LICENSE="ZPL"
 KEYWORDS="x86"
-IUSE=""
+
+S=${WORKDIR}/lib/python/Products
 
 ZPROD_LIST="TinyTablePlus"
diff --git a/net-zope/translationservice/translationservice-0.3.ebuild b/net-zope/translationservice/translationservice-0.3.ebuild
index 65972adfb4ca..5507fa046268 100644
--- a/net-zope/translationservice/translationservice-0.3.ebuild
+++ b/net-zope/translationservice/translationservice-0.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/translationservice/translationservice-0.3.ebuild,v 1.8 2004/08/08 00:37:14 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/translationservice-0.3.ebuild,v 1.9 2006/01/27 02:48:07 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Translation service for zope. i18n tags in ZPT."
+DESCRIPTION="Translation service for zope. i18n tags in ZPT"
 HOMEPAGE="http://www.zope.org/Members/efge/TranslationService/"
 SRC_URI="${HOMEPAGE}/TranslationService-${PV}.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="TranslationService"
diff --git a/net-zope/translationservice/translationservice-0.4.ebuild b/net-zope/translationservice/translationservice-0.4.ebuild
index 80ac994eca8a..82a5b843a64a 100644
--- a/net-zope/translationservice/translationservice-0.4.ebuild
+++ b/net-zope/translationservice/translationservice-0.4.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/translationservice/translationservice-0.4.ebuild,v 1.4 2004/08/08 00:37:14 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/translationservice-0.4.ebuild,v 1.5 2006/01/27 02:48:07 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Translation service for zope. i18n tags in ZPT."
+DESCRIPTION="Translation service for zope. i18n tags in ZPT"
 HOMEPAGE="http://www.zope.org/Members/efge/TranslationService/"
 SRC_URI="${HOMEPAGE}/TranslationService-${PV}.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 ZPROD_LIST="TranslationService"
diff --git a/net-zope/ttwtype/ttwtype-0.9.1.ebuild b/net-zope/ttwtype/ttwtype-0.9.1.ebuild
index 1217e075b89b..d4f94827b09d 100644
--- a/net-zope/ttwtype/ttwtype-0.9.1.ebuild
+++ b/net-zope/ttwtype/ttwtype-0.9.1.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/ttwtype/ttwtype-0.9.1.ebuild,v 1.4 2004/06/25 01:25:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ttwtype/ttwtype-0.9.1.ebuild,v 1.5 2006/01/27 02:48:27 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Create new content types via the ZMI for plone."
+DESCRIPTION="Create new content types via the ZMI for plone"
 HOMEPAGE="http://www.zope.org/Members/comlounge/TTWType/"
 SRC_URI="${HOMEPAGE}TTWType-${PV}.tgz"
+
 LICENSE="BSD"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
-RDEPEND=">=net-zope/plone-1.0.1
-	${RDEPEND}"
+RDEPEND=">=net-zope/plone-1.0.1"
 
 ZPROD_LIST="TTWType"
diff --git a/net-zope/validation/validation-1.3.0.11.ebuild b/net-zope/validation/validation-1.3.0.11.ebuild
index 1d674c3f44cc..312ee3330c42 100644
--- a/net-zope/validation/validation-1.3.0.11.ebuild
+++ b/net-zope/validation/validation-1.3.0.11.ebuild
@@ -1,31 +1,27 @@
-# 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/validation/validation-1.3.0.11.ebuild,v 1.3 2005/04/02 08:46:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/validation-1.3.0.11.ebuild,v 1.4 2006/01/27 02:48:48 vapier Exp $
 
 inherit zproduct
 
 MASTER_PN=archetypes
-
-DESCRIPTION="Data validation package, originally designed for Archetypes."
-WEBPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
+DESCRIPTION="Data validation package, originally designed for Archetypes"
+HOMEPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
 SRC_URI="mirror://sourceforge/${MASTER_PN}/${PN}-1.3.0-11.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"
 
 ZPROD_LIST="validation"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
-
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "Please be warned that it should not be used together with dev-python/validation !"
 }
diff --git a/net-zope/validation/validation-1.3.0.ebuild b/net-zope/validation/validation-1.3.0.ebuild
index f0b8a08d9290..5b38292eb8f5 100644
--- a/net-zope/validation/validation-1.3.0.ebuild
+++ b/net-zope/validation/validation-1.3.0.ebuild
@@ -1,31 +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/validation/validation-1.3.0.ebuild,v 1.1 2004/10/07 21:30:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/validation-1.3.0.ebuild,v 1.2 2006/01/27 02:48:48 vapier Exp $
 
 inherit zproduct
 
 MASTER_PN=archetypes
-
-DESCRIPTION="Data validation package, originally designed for Archetypes."
-WEBPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
+DESCRIPTION="Data validation package, originally designed for Archetypes"
+HOMEPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
 SRC_URI="mirror://sourceforge/${MASTER_PN}/${P}-8.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
 SLOT="1.3"
+KEYWORDS="~ppc ~x86"
 
 RDEPEND=">=net-zope/cmf-1.4.7"
 
 ZPROD_LIST="validation"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
-
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "Please be warned that it should not be used together with dev-python/validation !"
 }
diff --git a/net-zope/validation/validation-1.3.1.ebuild b/net-zope/validation/validation-1.3.1.ebuild
index 63333b596a43..2b5af69e3c49 100644
--- a/net-zope/validation/validation-1.3.1.ebuild
+++ b/net-zope/validation/validation-1.3.1.ebuild
@@ -1,29 +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/validation/validation-1.3.1.ebuild,v 1.1 2005/04/15 17:16:44 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/validation-1.3.1.ebuild,v 1.2 2006/01/27 02:48:48 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Data validation package, originally designed for Archetypes."
-WEBPAGE="http://www.sourceforge.net/projects/archetypes"
+DESCRIPTION="Data validation package, originally designed for Archetypes"
+HOMEPAGE="http://www.sourceforge.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${PF}-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"
 
 ZPROD_LIST="validation"
 
-src_install()
-{
+src_install() {
 	zproduct_src_install all
-
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	ewarn "Please be warned that it should not be used together with dev-python/validation !"
 }
diff --git a/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild b/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild
index e54242dfc210..cc3236615812 100644
--- a/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild
+++ b/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild
@@ -1,19 +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/verbosesecurity/verbosesecurity-0.5.ebuild,v 1.4 2005/01/13 20:56:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild,v 1.5 2006/01/27 02:49:08 vapier Exp $
 
 inherit zproduct eutils
 
 DESCRIPTION="Zope Product which explains the reason for denied security access"
 HOMEPAGE="http://hathaway.freezope.org/Software/VerboseSecurity"
 SRC_URI="http://hathaway.freezope.org/Software/VerboseSecurity/VerboseSecurity-${PV}.tar.gz"
-S="${WORKDIR}"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86"
-ZPROD_LIST="VerboseSecurity"
 
-RDEPEND=">=net-zope/zope-2.6.0
-	${RDEPEND}"
+RDEPEND=">=net-zope/zope-2.6.0"
+
+S=${WORKDIR}
+
+ZPROD_LIST="VerboseSecurity"
 
 pkg_preinst() {
 	echo
diff --git a/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild b/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild
index f1e5aa7306a0..54eefcba1f22 100644
--- a/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild
+++ b/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild
@@ -1,20 +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/verbosesecurity/verbosesecurity-0.6.ebuild,v 1.1 2005/01/13 20:56:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild,v 1.2 2006/01/27 02:49:08 vapier Exp $
 
 inherit zproduct eutils
 
 DESCRIPTION="Zope Product which explains the reason for denied security access"
 HOMEPAGE="http://hathawaymix.org/Software/VerboseSecurity"
 SRC_URI="${HOMEPAGE}/VerboseSecurity-${PV}.tar.gz"
-S="${WORKDIR}"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86"
-ZPROD_LIST="VerboseSecurity"
-IUSE=""
 
-RDEPEND=">=net-zope/zope-2.7.0
-	${RDEPEND}"
+RDEPEND=">=net-zope/zope-2.7.0"
+
+S=${WORKDIR}
+
+ZPROD_LIST="VerboseSecurity"
 
 pkg_preinst() {
 	echo