misc touchups

(Portage version: 2.1_pre3-r1)

42 files changed, 233 insertions, 264 deletions

diff --git a/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild b/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild
index f5ece6a1cb3f..d0200dfededb 100644
--- a/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild
+++ b/net-zope/xmlwidgets/xmlwidgets-0.10.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/xmlwidgets/xmlwidgets-0.10.3.ebuild,v 1.3 2005/02/21 21:35:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild,v 1.4 2006/01/27 02:49:28 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="UI widgets for Zope XML objects."
+DESCRIPTION="UI widgets for Zope XML objects"
 HOMEPAGE="http://www.infrae.com/download/XMLWidgets"
 SRC_URI="${HOMEPAGE}/${PV}/XMLWidgets-${PV}.tgz"
+
 LICENSE="ZPL"
-IUSE=""
-KEYWORDS="x86 ~amd64"
-RDEPEND=">=net-zope/parsedxml-1.4
-	${RDEPEND}"
+KEYWORDS="~amd64 x86"
+
+RDEPEND=">=net-zope/parsedxml-1.4"
 
 ZPROD_LIST="XMLWidgets"
diff --git a/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild b/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild
index e8c1f5e550da..9bacbbf03362 100644
--- a/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild
+++ b/net-zope/xmlwidgets/xmlwidgets-0.11.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/xmlwidgets/xmlwidgets-0.11.ebuild,v 1.2 2005/05/04 13:08:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild,v 1.3 2006/01/27 02:49:28 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="UI widgets for Zope XML objects."
+DESCRIPTION="UI widgets for Zope XML objects"
 HOMEPAGE="http://www.infrae.com/download/XMLWidgets"
 SRC_URI="${HOMEPAGE}/${PV}/XMLWidgets-${PV}.tgz"
+
 LICENSE="ZPL"
-IUSE=""
-KEYWORDS="~x86 ~amd64 ~ppc"
-RDEPEND=">=net-zope/parsedxml-1.4
-	${RDEPEND}"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=net-zope/parsedxml-1.4"
 
 ZPROD_LIST="XMLWidgets"
diff --git a/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild b/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild
index 8149804d337c..fc6e06e0f23e 100644
--- a/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild
+++ b/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild
@@ -1,15 +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/xmlwidgets/xmlwidgets-0.9.ebuild,v 1.5 2005/02/21 21:35:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild,v 1.6 2006/01/27 02:49:28 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="UI widgets for Zope XML objects."
+DESCRIPTION="UI widgets for Zope XML objects"
 HOMEPAGE="http://www.zope.org/Members/faassen/XMLWidgets"
 SRC_URI="${HOMEPAGE}/XMLWidgets-${PV}.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-RDEPEND=">=net-zope/parsedxml-1.3.1
-	${RDEPEND}"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND=">=net-zope/parsedxml-1.3.1"
 
 ZPROD_LIST="XMLWidgets"
diff --git a/net-zope/xron/xron-0.0.10.ebuild b/net-zope/xron/xron-0.0.10.ebuild
index 361e359bbc2c..ab77f5a8b995 100644
--- a/net-zope/xron/xron-0.0.10.ebuild
+++ b/net-zope/xron/xron-0.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/xron/xron-0.0.10.ebuild,v 1.3 2004/06/25 01:26:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xron/xron-0.0.10.ebuild,v 1.4 2006/01/27 02:49:48 vapier Exp $
 
 inherit zproduct
 
@@ -10,6 +10,7 @@ MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="Xron schedules and executes procedures for Zope applications"
 HOMEPAGE="http://www.zope.org/Members/lstaffor/Xron"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_P}.tgz"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
@@ -24,4 +25,3 @@ src_install() {
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
-
diff --git a/net-zope/zaaplugins/zaaplugins-2.12.ebuild b/net-zope/zaaplugins/zaaplugins-2.12.ebuild
index 18378f28c0ee..f1e823a19dd5 100644
--- a/net-zope/zaaplugins/zaaplugins-2.12.ebuild
+++ b/net-zope/zaaplugins/zaaplugins-2.12.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zaaplugins/zaaplugins-2.12.ebuild,v 1.2 2004/10/14 20:00:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zaaplugins/zaaplugins-2.12.ebuild,v 1.3 2006/01/27 02:50:10 vapier Exp $
 
 inherit zproduct
 
 DESCRIPTION="A collection of ZAttachmentAttribute Plugins"
 HOMEPAGE="http://ingeniweb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ingeniweb/ZAAPlugins-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+
 DEPEND=">=net-zope/zattachmentattribute-2.12
-		>=app-text/wv-1.0.0
-		>=app-text/xlhtml-0.5
-		>=app-text/xpdf-2.03"
+	>=app-text/wv-1.0.0
+	>=app-text/xlhtml-0.5
+	>=app-text/xpdf-2.03"
 
 ZPROD_LIST="ZAAPlugins"
 
diff --git a/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild b/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild
index 3bfb38a57218..b7ea32e2e7fd 100644
--- a/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild
+++ b/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild
@@ -1,25 +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/zattachmentattribute/zattachmentattribute-2.13.ebuild,v 1.2 2004/10/14 19:59:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild,v 1.3 2006/01/27 02:50:30 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="ZAttachmentAttribute simplifies the use of simple attachment files with user-created Zope products."
+DESCRIPTION="ZAttachmentAttribute simplifies the use of simple attachment files with user-created Zope products"
 HOMEPAGE="http://ingeniweb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ingeniweb/ZAttachmentAttribute-${PV}.tar.gz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
 
 DEPEND=">=net-zope/cmf-1.4.2-r1
-		>=net-zope/zope-2.7.0
-		app-admin/zprod-manager"
+	>=net-zope/zope-2.7.0
+	app-admin/zprod-manager"
 
 ZPROD_LIST="ZAttachmentAttribute"
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	einfo "Please consider also emerge zaaplugins package which contains usefull plugins."
 }
-
diff --git a/net-zope/zfspath/zfspath-1.0.1.ebuild b/net-zope/zfspath/zfspath-1.0.1.ebuild
index b2f2fb4da3e9..b118ef47c4ae 100644
--- a/net-zope/zfspath/zfspath-1.0.1.ebuild
+++ b/net-zope/zfspath/zfspath-1.0.1.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/zfspath/zfspath-1.0.1.ebuild,v 1.3 2004/10/18 12:33:42 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zfspath/zfspath-1.0.1.ebuild,v 1.4 2006/01/27 02:50:50 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Zope product to allow access to the filesystem."
+DESCRIPTION="Zope product to allow access to the filesystem"
 HOMEPAGE="http://zope.org/Members/asterisk/ZFSPath/"
 SRC_URI="http://zope.org/Members/asterisk/ZFSPath/${PV}/ZFSPath-${PV}.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-RDEPEND=">=net-zope/zope-2.6.4
-	    ${RDEPEND}"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND=">=net-zope/zope-2.6.4"
 
 ZPROD_LIST="ZFSPath"
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	einfo "Please view this product documentation through the ZMI for usage instructions."
 }
diff --git a/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild b/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild
index 7412fc65c14a..9f7c306c2e35 100644
--- a/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild
+++ b/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild
@@ -1,17 +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/zmysqlda/zmysqlda-2.0.8-r1.ebuild,v 1.3 2005/01/02 12:59:41 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild,v 1.4 2006/01/27 02:51:11 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/lib/python/Products/"
 
-DESCRIPTION="A MySQL Database Adapter(DA) for zope."
+DESCRIPTION="A MySQL Database Adapter(DA) for zope"
 HOMEPAGE="http://sourceforge.net/projects/mysql-python"
 SRC_URI="mirror://sourceforge/mysql-python/ZMySQLDA-${PV}.tar.gz"
+
 LICENSE="|| ( GPL-2 CNRI )"
-KEYWORDS="~x86 ~ppc"
-RDEPEND=">=dev-python/mysql-python-1.0
-	${RDEPEND}"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND=">=dev-python/mysql-python-1.0"
+
+S=${WORKDIR}/lib/python/Products/
 
 ZPROD_LIST="ZMySQLDA"
-IUSE=""
diff --git a/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild b/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
index 4ac014d37a5b..c1557ef8bc7b 100644
--- a/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
+++ b/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
@@ -1,17 +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/zmysqlda/zmysqlda-2.0.8.ebuild,v 1.8 2005/01/02 12:59:41 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild,v 1.9 2006/01/27 02:51:11 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/lib/python/Products/"
 
-DESCRIPTION="A MySQL Database Adapter(DA) for zope."
+DESCRIPTION="A MySQL Database Adapter(DA) for zope"
 HOMEPAGE="http://sourceforge.net/projects/mysql-python"
 SRC_URI="mirror://sourceforge/mysql-python/ZMySQLDA-${PV}.tar.gz"
+
 LICENSE="|| ( GPL-2 CNRI )"
-KEYWORDS="x86 ~ppc"
-RDEPEND=">=dev-python/mysql-python-0.9.2
-	${RDEPEND}"
+KEYWORDS="~ppc x86"
+
+RDEPEND=">=dev-python/mysql-python-0.9.2"
+
+S=${WORKDIR}/lib/python/Products
 
 ZPROD_LIST="ZMySQLDA"
-IUSE=""
diff --git a/net-zope/zodb/zodb-3.2.8.ebuild b/net-zope/zodb/zodb-3.2.8.ebuild
index d9b7b98ccf8f..abf507bc157c 100644
--- a/net-zope/zodb/zodb-3.2.8.ebuild
+++ b/net-zope/zodb/zodb-3.2.8.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/zodb/zodb-3.2.8.ebuild,v 1.2 2005/06/06 20:00:39 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.2.8.ebuild,v 1.3 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.2"
 SRC_URI="${HOMEPAGE}/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
-IUSE=""
+
 LICENSE="ZPL"
 SLOT="3.2"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.3.4"
 
diff --git a/net-zope/zodb/zodb-3.2.9.ebuild b/net-zope/zodb/zodb-3.2.9.ebuild
index 64b81dcd48a9..3f49033c219d 100644
--- a/net-zope/zodb/zodb-3.2.9.ebuild
+++ b/net-zope/zodb/zodb-3.2.9.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/zodb/zodb-3.2.9.ebuild,v 1.1 2005/07/08 21:08:38 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.2.9.ebuild,v 1.2 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.2"
 SRC_URI="${HOMEPAGE}/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
-IUSE=""
+
 LICENSE="ZPL"
 SLOT="3.2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.3.5"
 
diff --git a/net-zope/zodb/zodb-3.3.1.ebuild b/net-zope/zodb/zodb-3.3.1.ebuild
index 9135bb41f101..b2c2bb5d4f00 100644
--- a/net-zope/zodb/zodb-3.3.1.ebuild
+++ b/net-zope/zodb/zodb-3.3.1.ebuild
@@ -1,18 +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/zodb/zodb-3.3.1.ebuild,v 1.2 2005/06/06 20:00:39 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.3.1.ebuild,v 1.3 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.3"
 SRC_URI="http://zope.org/Products/${MY_P}3.3/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
 
 LICENSE="ZPL"
 SLOT="3.3"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.3.4"
diff --git a/net-zope/zodb/zodb-3.4.0.ebuild b/net-zope/zodb/zodb-3.4.0.ebuild
index 960a554ead7a..3d44b7f77251 100644
--- a/net-zope/zodb/zodb-3.4.0.ebuild
+++ b/net-zope/zodb/zodb-3.4.0.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/zodb/zodb-3.4.0.ebuild,v 1.2 2005/06/11 12:05:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.4.0.ebuild,v 1.3 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.4"
 SRC_URI="http://zope.org/Products/${MY_P}3.4/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="3.4"
 KEYWORDS="~ppc ~x86"
diff --git a/net-zope/zodb/zodb-3.4.1.ebuild b/net-zope/zodb/zodb-3.4.1.ebuild
index 0c3b65c9edf6..4d990f207141 100644
--- a/net-zope/zodb/zodb-3.4.1.ebuild
+++ b/net-zope/zodb/zodb-3.4.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/zodb/zodb-3.4.1.ebuild,v 1.1 2005/08/10 19:59:32 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.4.1.ebuild,v 1.2 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.4"
 SRC_URI="http://zope.org/Products/${MY_P}3.4/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="3.4"
 KEYWORDS="~ppc ~x86"
diff --git a/net-zope/zodb/zodb-3.5.0.ebuild b/net-zope/zodb/zodb-3.5.0.ebuild
index a3732e8345e5..951e2f4f4579 100644
--- a/net-zope/zodb/zodb-3.5.0.ebuild
+++ b/net-zope/zodb/zodb-3.5.0.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/zodb/zodb-3.5.0.ebuild,v 1.1 2005/09/10 22:13:45 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.5.0.ebuild,v 1.2 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.5"
 SRC_URI="http://zope.org/Products/${MY_P}3.5/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
diff --git a/net-zope/zodb/zodb-3.5.1.ebuild b/net-zope/zodb/zodb-3.5.1.ebuild
index b0feb19f3234..680e2b17e61f 100644
--- a/net-zope/zodb/zodb-3.5.1.ebuild
+++ b/net-zope/zodb/zodb-3.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/zodb/zodb-3.5.1.ebuild,v 1.1 2005/10/01 16:38:27 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.5.1.ebuild,v 1.2 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.5"
 SRC_URI="http://zope.org/Products/${MY_P}3.5/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
diff --git a/net-zope/zodb/zodb-3.6.0.ebuild b/net-zope/zodb/zodb-3.6.0.ebuild
index e35735ea36ed..987869ba1f7d 100644
--- a/net-zope/zodb/zodb-3.6.0.ebuild
+++ b/net-zope/zodb/zodb-3.6.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.6.0.ebuild,v 1.1 2006/01/05 21:47:08 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.6.0.ebuild,v 1.2 2006/01/27 02:51:32 vapier Exp $
 
 inherit distutils
 
 MY_P=ZODB
-
-DESCRIPTION="Zope Object DataBase."
+DESCRIPTION="Zope Object DataBase"
 HOMEPAGE="http://zope.org/Products/ZODB3.6"
 SRC_URI="http://zope.org/Products/${MY_P}3.6/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
diff --git a/net-zope/zope/zope-2.6.4-r1.ebuild b/net-zope/zope/zope-2.6.4-r1.ebuild
index 456aa9a0d6e0..2b797136e95f 100644
--- a/net-zope/zope/zope-2.6.4-r1.ebuild
+++ b/net-zope/zope/zope-2.6.4-r1.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/zope/zope-2.6.4-r1.ebuild,v 1.15 2005/07/09 16:06:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.4-r1.ebuild,v 1.16 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-src.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
-
-KEYWORDS="x86 sparc ppc ~alpha"
+KEYWORDS="~alpha ppc sparc x86"
 IUSE="unicode"
 
 # This is for developers that wish to test Zope with virtual/python.
@@ -102,7 +102,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc LICENSE.txt README.txt
+	dodoc README.txt
 	docinto doc ; dodoc doc/*.txt
 	docinto doc/PLATFORMS ; dodoc doc/PLATFORMS/*
 	docinto doc/changenotes ; dodoc doc/changenotes/*
diff --git a/net-zope/zope/zope-2.7.7.ebuild b/net-zope/zope/zope-2.7.7.ebuild
index 6086780ed8d5..65c1c1a07a46 100644
--- a/net-zope/zope/zope-2.7.7.ebuild
+++ b/net-zope/zope/zope-2.7.7.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/zope/zope-2.7.7.ebuild,v 1.4 2005/12/31 14:01:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.7.ebuild,v 1.5 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
-
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="unicode"
 
@@ -104,4 +104,3 @@ pkg_prerm() {
 
 	rm ${ZSERVDIR}/bin/python
 }
-
diff --git a/net-zope/zope/zope-2.7.8.ebuild b/net-zope/zope/zope-2.7.8.ebuild
index 8a9b4e110d88..0e4154153378 100644
--- a/net-zope/zope/zope-2.7.8.ebuild
+++ b/net-zope/zope/zope-2.7.8.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/zope/zope-2.7.8.ebuild,v 1.7 2005/12/31 14:01:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.8.ebuild,v 1.8 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
-
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="unicode"
 
@@ -104,4 +104,3 @@ pkg_prerm() {
 
 	rm ${ZSERVDIR}/bin/python
 }
-
diff --git a/net-zope/zope/zope-2.8.3.ebuild b/net-zope/zope/zope-2.8.3.ebuild
index a9a86cd0e04b..113f08582a80 100644
--- a/net-zope/zope/zope-2.8.3.ebuild
+++ b/net-zope/zope/zope-2.8.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/zope/zope-2.8.3.ebuild,v 1.1 2005/10/19 20:47:01 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.3.ebuild,v 1.2 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils multilib
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
-
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
@@ -107,4 +107,3 @@ pkg_prerm() {
 
 	rm ${ZSERVDIR}/bin/python
 }
-
diff --git a/net-zope/zope/zope-2.8.4.ebuild b/net-zope/zope/zope-2.8.4.ebuild
index ff6f26f188a5..7192b85bbb14 100644
--- a/net-zope/zope/zope-2.8.4.ebuild
+++ b/net-zope/zope/zope-2.8.4.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.4.ebuild,v 1.4 2006/01/02 17:51:04 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.4.ebuild,v 1.5 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils multilib
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
-
 KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="unicode"
 
@@ -107,4 +107,3 @@ pkg_prerm() {
 
 	rm ${ZSERVDIR}/bin/python
 }
-
diff --git a/net-zope/zope/zope-2.9.0.ebuild b/net-zope/zope/zope-2.9.0.ebuild
index b5d210c48d9d..5e639d5282ed 100644
--- a/net-zope/zope/zope-2.9.0.ebuild
+++ b/net-zope/zope/zope-2.9.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.0.ebuild,v 1.1 2006/01/07 20:17:12 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.0.ebuild,v 1.2 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils multilib
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
-
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
@@ -77,4 +77,3 @@ pkg_prerm() {
 	#existing targets
 	rm ${ZSERVDIR}/bin/python
 }
-
diff --git a/net-zope/zope/zope-3.1.0.ebuild b/net-zope/zope/zope-3.1.0.ebuild
index 36dea4f8706f..0a13560fba5a 100644
--- a/net-zope/zope/zope-3.1.0.ebuild
+++ b/net-zope/zope/zope-3.1.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.1.0.ebuild,v 1.2 2005/12/27 18:06:19 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.1.0.ebuild,v 1.3 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils multilib
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope3/${PV}final/Zope-${PV}.tgz"
 
 LICENSE="ZPL"
 SLOT="${PV}"
-IUSE=""
-
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND="=dev-lang/python-2.4*"
-
 DEPEND="${RDEPEND}
 	>=app-shells/bash-2.0
 	>=sys-apps/sed-4.0.5"
 
-S="${WORKDIR}/Zope-${PV}"
+S=${WORKDIR}/Zope-${PV}
 
 ZUNAME=zope
 ZGNAME=zope
diff --git a/net-zope/zope/zope-3.2.0.ebuild b/net-zope/zope/zope-3.2.0.ebuild
index 2e6e9ac3759d..80cdc4de47c7 100644
--- a/net-zope/zope/zope-3.2.0.ebuild
+++ b/net-zope/zope/zope-3.2.0.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.2.0.ebuild,v 1.2 2006/01/11 04:58:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-3.2.0.ebuild,v 1.3 2006/01/27 02:51:54 vapier Exp $
 
 inherit eutils multilib
 
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/Zope3/${PV}final/Zope-${PV}.tgz"
 
 LICENSE="ZPL"
 SLOT="${PV}"
-IUSE=""
-
 KEYWORDS="~sparc ~x86"
+IUSE=""
 
 RDEPEND="=dev-lang/python-2.4*"
-
 DEPEND="${RDEPEND}
 	>=app-shells/bash-2.0
 	>=sys-apps/sed-4.0.5"
 
-S="${WORKDIR}/Zope-${PV}"
+S=${WORKDIR}/Zope-${PV}
 
 ZUNAME=zope
 ZGNAME=zope
diff --git a/net-zope/zopeedit/zopeedit-0.7.ebuild b/net-zope/zopeedit/zopeedit-0.7.ebuild
index 388739d5e672..f7536cc858bb 100644
--- a/net-zope/zopeedit/zopeedit-0.7.ebuild
+++ b/net-zope/zopeedit/zopeedit-0.7.ebuild
@@ -1,14 +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/zopeedit/zopeedit-0.7.ebuild,v 1.4 2005/01/02 14:17:40 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeedit/zopeedit-0.7.ebuild,v 1.5 2006/01/27 02:52:14 vapier Exp $
 
 inherit distutils
 
-DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects."
+DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects"
 HOMEPAGE="http://www.zope.org/Members/Caseman/ExternalEditor/"
 SRC_URI="http://www.zope.org/Members/Caseman/ExternalEditor/0.7/zopeedit-${PV}-src.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="x86 ~ppc ~amd64"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
+
 S=${WORKDIR}/${PN}-${PV}-src
diff --git a/net-zope/zopeedit/zopeedit-0.8.ebuild b/net-zope/zopeedit/zopeedit-0.8.ebuild
index 9ed052bf45ca..4fa7e138b1fc 100644
--- a/net-zope/zopeedit/zopeedit-0.8.ebuild
+++ b/net-zope/zopeedit/zopeedit-0.8.ebuild
@@ -1,14 +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/zopeedit/zopeedit-0.8.ebuild,v 1.1 2005/01/02 14:17:40 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeedit/zopeedit-0.8.ebuild,v 1.2 2006/01/27 02:52:14 vapier Exp $
 
 inherit distutils
 
-DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects."
+DESCRIPTION="The ExternalEditor is a Zope product and configurable helper application that allows you to drop into your favorite editor(s) directly from the ZMI to modify Zope objects"
 HOMEPAGE="http://www.zope.org/Members/Caseman/ExternalEditor/"
 SRC_URI="http://www.zope.org/Members/Caseman/ExternalEditor/${PV}/zopeedit-${PV}-src.tgz"
+
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~amd64"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
 S=${WORKDIR}/${PN}-${PV}-src
diff --git a/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild b/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild
index e56da1b9e400..7e95592d762d 100644
--- a/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild
+++ b/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild,v 1.3 2005/02/17 14:27:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild,v 1.4 2006/01/27 02:52:36 vapier Exp $
 
 inherit distutils
 
 MY_PN="ZopeInterface"
-
 DESCRIPTION="Standalone Zope interface library"
 HOMEPAGE="http://zope.org/Products/ZopeInterface"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${PV}/${MY_PN}-${PV}.tgz"
-LICENSE="ZPL"
 
+LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc"
 
 RDEPEND="=dev-lang/python-2.3*"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_PN}-${PV}
 
 src_install() {
-
 	distutils_src_install
 
 	if use doc ; then
@@ -29,6 +27,5 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	distutils_pkg_postinst
 }
diff --git a/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild b/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild
index e785d6643b02..a8a85881c90a 100644
--- a/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild
+++ b/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild,v 1.10 2006/01/06 05:35:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild,v 1.11 2006/01/27 02:52:36 vapier Exp $
 
 inherit distutils
 
 MY_PN="ZopeInterface"
-
 DESCRIPTION="Standalone Zope interface library"
 HOMEPAGE="http://zope.org/Products/ZopeInterface"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${PV}final/${MY_PN}-${PV}.tgz"
diff --git a/net-zope/zopex3/zopex3-3.0.0.ebuild b/net-zope/zopex3/zopex3-3.0.0.ebuild
index 4bee1d04d9d5..9441b117fc62 100644
--- a/net-zope/zopex3/zopex3-3.0.0.ebuild
+++ b/net-zope/zopex3/zopex3-3.0.0.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zopex3/zopex3-3.0.0.ebuild,v 1.6 2005/10/18 16:49:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopex3/zopex3-3.0.0.ebuild,v 1.7 2006/01/27 02:52:56 vapier Exp $
 
 inherit eutils
 
 MYPN="ZopeX3"
-
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
 HOMEPAGE="http://www.zope.org"
 SRC_URI="http://www.zope.org/Products/${MYPN}/${PV}final/${MYPN}-${PV}.tgz"
+
 LICENSE="ZPL"
 SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-KEYWORDS="x86 ~ppc ~amd64"
-
 RDEPEND="=dev-lang/python-2.3*"
 python='python2.3'
 
 DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
+	virtual/libc
+	>=sys-apps/sed-4.0.5"
 
 S="${WORKDIR}/${MYPN}-${PV}"
 ZS_DIR=${ROOT%/}/usr/lib
@@ -28,11 +27,6 @@ ZSERVDIR=${ZS_DIR}/${PN}-${PV}
 ZSKELDIR=${ZSERVDIR}/zopeskel
 ZINSTDIR=/var/lib/zope/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
 	./configure --prefix=${D}${ZSERVDIR} --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
diff --git a/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild b/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
index 9c5f1940c276..acb72bc42a27 100644
--- a/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
+++ b/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
@@ -1,19 +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/zphotoslides/zphotoslides-1.1-r1.ebuild,v 1.5 2004/10/23 22:43:41 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild,v 1.6 2006/01/27 02:53:18 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Present your photos quickly in zope."
+DESCRIPTION="Present your photos quickly in zope"
 HOMEPAGE="http://www.zphotoslides.org/"
 SRC_URI="mirror://sourceforge/zphotoslides/ZPhotoSlides-${PV}b.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 RDEPEND=">=dev-python/imaging-1.1.3
-	>=net-zope/localfs-1.0.0
-	${RDEPEND}"
+	>=net-zope/localfs-1.0.0"
 
 ZPROD_LIST="ZPhotoSlides"
 DOTTXT_PROTECT="country-codes.txt ${DOTTXT_PROTECT}"
-IUSE=""
diff --git a/net-zope/zphotoslides/zphotoslides-2.0.ebuild b/net-zope/zphotoslides/zphotoslides-2.0.ebuild
index eec59b06cac9..6831ecd07175 100644
--- a/net-zope/zphotoslides/zphotoslides-2.0.ebuild
+++ b/net-zope/zphotoslides/zphotoslides-2.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-2.0.ebuild,v 1.1 2004/10/23 22:54:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-2.0.ebuild,v 1.2 2006/01/27 02:53:18 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="Present your photos quickly in zope."
+DESCRIPTION="Present your photos quickly in zope"
 HOMEPAGE="http://www.zphotoslides.org/"
 SRC_URI="mirror://sourceforge/zphotoslides/ZPhotoSlides-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 RDEPEND=">=dev-python/imaging-1.1.3
-	>=net-zope/localfs-1.0.0
-	${RDEPEND}"
+	>=net-zope/localfs-1.0.0"
 
 ZPROD_LIST="ZPhotoSlides"
-IUSE=""
diff --git a/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild b/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild
index 1fdd9bb4e685..f1421624329c 100644
--- a/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild
+++ b/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild
@@ -1,23 +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/zpsycopgda/zpsycopgda-1.1.15.ebuild,v 1.1 2004/10/23 23:01:03 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild,v 1.2 2006/01/27 02:53:39 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/psycopg-${PV}/"
 
-DESCRIPTION="PostgreSQL database adapter for Zope."
-SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
+DESCRIPTION="PostgreSQL database adapter for Zope"
 HOMEPAGE="http://www.initd.org/software/psycopg.py"
-RDEPEND=">=dev-python/psycopg-${PV}
-	${RDEPEND}"
-KEYWORDS="x86 ~ppc"
+SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
+
 LICENSE="GPL-2"
+KEYWORDS="~ppc x86"
+
+RDEPEND=">=dev-python/psycopg-${PV}"
+
+S=${WORKDIR}/psycopg-${PV}
 
 ZPROD_LIST="ZPsycopgDA"
-IUSE=""
 
-src_compile()
-{
+src_compile() {
 	rm -f * >& /dev/null
 	rm -fR debian/ doc/ tests/
 }
diff --git a/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild b/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild
index e44769ce28af..357f8755fd11 100644
--- a/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild
+++ b/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild
@@ -1,23 +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/zpsycopgda/zpsycopgda-1.1.2.ebuild,v 1.6 2004/10/23 23:01:03 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild,v 1.7 2006/01/27 02:53:39 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/psycopg-${PV}/"
 
-DESCRIPTION="PostgreSQL database adapter for Zope."
-SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
+DESCRIPTION="PostgreSQL database adapter for Zope"
 HOMEPAGE="http://www.initd.org/software/psycopg.py"
-RDEPEND=">=dev-python/psycopg-${PV}
-	${RDEPEND}"
-KEYWORDS="x86 ~ppc"
+SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
+
 LICENSE="GPL-2"
+KEYWORDS="~ppc x86"
+
+RDEPEND=">=dev-python/psycopg-${PV}"
+
+S=${WORKDIR}/psycopg-${PV}
 
 ZPROD_LIST="ZPsycopgDA"
-IUSE=""
 
-src_compile()
-{
+src_compile() {
 	rm -f * >& /dev/null
 	rm -fR debian/ doc/ tests/
 }
diff --git a/net-zope/zpsycopgda/zpsycopgda-1.1.21.ebuild b/net-zope/zpsycopgda/zpsycopgda-1.1.21.ebuild
index c23a91bb148d..017fde263489 100644
--- a/net-zope/zpsycopgda/zpsycopgda-1.1.21.ebuild
+++ b/net-zope/zpsycopgda/zpsycopgda-1.1.21.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/zpsycopgda-1.1.21.ebuild,v 1.1 2005/12/11 19:42:17 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/zpsycopgda-1.1.21.ebuild,v 1.2 2006/01/27 02:53:39 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/psycopg-${PV}/"
 
-DESCRIPTION="PostgreSQL database adapter for Zope."
-SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
+DESCRIPTION="PostgreSQL database adapter for Zope"
 HOMEPAGE="http://www.initd.org/software/psycopg.py"
-RDEPEND=">=dev-python/psycopg-${PV}
-	${RDEPEND}"
-KEYWORDS="~x86 ~ppc"
+SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
+
 LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+
+RDEPEND=">=dev-python/psycopg-${PV}"
+
+S=${WORKDIR}/psycopg-${PV}
 
 ZPROD_LIST="ZPsycopgDA"
-IUSE=""
 
-src_compile()
-{
+src_compile() {
 	rm -f * >& /dev/null
 	rm -fR debian/ doc/ tests/
 }
diff --git a/net-zope/zsyncer/zsyncer-0.6.1.ebuild b/net-zope/zsyncer/zsyncer-0.6.1.ebuild
index f7235ee489d9..b5b00cb8a76f 100644
--- a/net-zope/zsyncer/zsyncer-0.6.1.ebuild
+++ b/net-zope/zsyncer/zsyncer-0.6.1.ebuild
@@ -1,18 +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/zsyncer/zsyncer-0.6.1.ebuild,v 1.1 2005/04/19 17:22:51 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zsyncer/zsyncer-0.6.1.ebuild,v 1.2 2006/01/27 02:53:59 vapier Exp $
 
 inherit zproduct
 
 MY_P="ZSyncer-${PV}"
-DESCRIPTION="ZSyncer allows live zope objects to be synchronized from one Zope to another."
+DESCRIPTION="ZSyncer allows live zope objects to be synchronized from one Zope to another"
 HOMEPAGE="http://zsyncer.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="ZPL"
-SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 DEPEND=">=net-zope/zope-2.7"
 
diff --git a/net-zope/zwiki/zwiki-0.37.ebuild b/net-zope/zwiki/zwiki-0.37.ebuild
index ee4d571492dd..b953aceb0a4e 100644
--- a/net-zope/zwiki/zwiki-0.37.ebuild
+++ b/net-zope/zwiki/zwiki-0.37.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/zwiki/zwiki-0.37.ebuild,v 1.2 2005/04/03 17:43:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.37.ebuild,v 1.3 2006/01/27 02:54:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites"
 HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="ZWiki"
-MYDOC="ChangeLog GPL.txt ${MYDOC}"
-
-IUSE=""
+MYDOC="ChangeLog ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.40.ebuild b/net-zope/zwiki/zwiki-0.40.ebuild
index dbfed64c32fc..7c28cfcf1696 100644
--- a/net-zope/zwiki/zwiki-0.40.ebuild
+++ b/net-zope/zwiki/zwiki-0.40.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/zwiki/zwiki-0.40.ebuild,v 1.2 2005/06/06 20:22:45 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.40.ebuild,v 1.3 2006/01/27 02:54:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites"
 HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 ZPROD_LIST="ZWiki"
-MYDOC="ChangeLog GPL.txt ${MYDOC}"
-
-IUSE=""
+MYDOC="ChangeLog ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.42.ebuild b/net-zope/zwiki/zwiki-0.42.ebuild
index 541ba5ce1b46..d613d510a79c 100644
--- a/net-zope/zwiki/zwiki-0.42.ebuild
+++ b/net-zope/zwiki/zwiki-0.42.ebuild
@@ -1,10 +1,10 @@
-# 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/zwiki/zwiki-0.42.ebuild,v 1.3 2005/08/28 12:49:50 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.42.ebuild,v 1.4 2006/01/27 02:54:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites"
 HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
@@ -12,6 +12,4 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc x86"
 
 ZPROD_LIST="ZWiki"
-MYDOC="CHANGES.txt LICENSE.txt README.txt GPL.txt ${MYDOC}"
-
-IUSE=""
+MYDOC="CHANGES.txt README.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.44.ebuild b/net-zope/zwiki/zwiki-0.44.ebuild
index fc7a26a50163..05cf89c435cb 100644
--- a/net-zope/zwiki/zwiki-0.44.ebuild
+++ b/net-zope/zwiki/zwiki-0.44.ebuild
@@ -1,10 +1,10 @@
-# 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/zwiki/zwiki-0.44.ebuild,v 1.1 2005/08/28 12:55:47 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.44.ebuild,v 1.2 2006/01/27 02:54:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites"
 HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
@@ -12,6 +12,4 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc ~x86"
 
 ZPROD_LIST="ZWiki"
-MYDOC="CHANGES.txt LICENSE.txt README.txt GPL.txt ${MYDOC}"
-
-IUSE=""
+MYDOC="CHANGES.txt README.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.45.ebuild b/net-zope/zwiki/zwiki-0.45.ebuild
index d0dc698c724d..51a0cb497b4c 100644
--- a/net-zope/zwiki/zwiki-0.45.ebuild
+++ b/net-zope/zwiki/zwiki-0.45.ebuild
@@ -1,10 +1,10 @@
-# 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/zwiki/zwiki-0.45.ebuild,v 1.1 2005/09/02 17:25:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.45.ebuild,v 1.2 2006/01/27 02:54:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites"
 HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
@@ -12,6 +12,4 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc ~x86"
 
 ZPROD_LIST="ZWiki"
-MYDOC="CHANGES.txt LICENSE.txt README.txt GPL.txt ${MYDOC}"
-
-IUSE=""
+MYDOC="CHANGES.txt README.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.48.ebuild b/net-zope/zwiki/zwiki-0.48.ebuild
index 56963f136ef9..78f7372e0913 100644
--- a/net-zope/zwiki/zwiki-0.48.ebuild
+++ b/net-zope/zwiki/zwiki-0.48.ebuild
@@ -1,10 +1,10 @@
-# 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/zwiki/zwiki-0.48.ebuild,v 1.1 2005/12/25 01:31:57 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.48.ebuild,v 1.2 2006/01/27 02:54:22 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites"
 HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
@@ -12,6 +12,4 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc ~x86"
 
 ZPROD_LIST="ZWiki"
-MYDOC="CHANGES.txt LICENSE.txt README.txt GPL.txt ${MYDOC}"
-
-IUSE=""
+MYDOC="CHANGES.txt README.txt ${MYDOC}"