misc touchups

(Portage version: 2.1_pre3-r1)

6 files changed, 53 insertions, 59 deletions

diff --git a/net-zope/plone/plone-1.0.5.ebuild b/net-zope/plone/plone-1.0.5.ebuild
index de4ead35292a..670be188d59d 100644
--- a/net-zope/plone/plone-1.0.5.ebuild
+++ b/net-zope/plone/plone-1.0.5.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.5.ebuild,v 1.7 2004/07/24 22:56:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.5.ebuild,v 1.8 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/CMFPlone-${PV}"
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/CMFPlone${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc x86"
+
 RDEPEND="=net-zope/cmf-1.3*
-	>=net-zope/formulator-1.2.0
-	${RDEPEND}"
+	>=net-zope/formulator-1.2.0"
+
+S=${WORKDIR}/CMFPlone-${PV}
 
 ZPROD_LIST="CMFPlone DCWorkflow"
 MYDOC="docs/NavigationTool.txt docs/SiteTypes.txt ${MYDOC}"
 
-src_install()
-{
+src_install() {
 	rm -R Formulator/
 	zproduct_src_install all
 }
 
 # Since i18n isn't a product folder, leaving it in $ZP_DIR/$PF.
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	einfo "---> NOTE: i18n folder location: ${ZP_DIR}/${PF}"
 }
diff --git a/net-zope/plone/plone-1.0.6.ebuild b/net-zope/plone/plone-1.0.6.ebuild
index d721c6ab19a0..97629487af69 100644
--- a/net-zope/plone/plone-1.0.6.ebuild
+++ b/net-zope/plone/plone-1.0.6.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.6.ebuild,v 1.1 2004/07/24 22:56:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.6.ebuild,v 1.2 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
-S="${WORKDIR}/CMFPlone-${PV}"
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/Plone-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+
 RDEPEND="=net-zope/cmf-1.3*
-	>=net-zope/formulator-1.2.0
-	${RDEPEND}"
+	>=net-zope/formulator-1.2.0"
+
+S=${WORKDIR}/CMFPlone-${PV}
 
 ZPROD_LIST="CMFPlone DCWorkflow"
 MYDOC="docs/NavigationTool.txt docs/SiteTypes.txt ${MYDOC}"
 
-src_install()
-{
+src_install() {
 	rm -R Formulator/
 	zproduct_src_install all
 }
 
 # Since i18n isn't a product folder, leaving it in $ZP_DIR/$PF.
 
-pkg_postinst()
-{
+pkg_postinst() {
 	zproduct_pkg_postinst
 	einfo "---> NOTE: i18n folder location: ${ZP_DIR}/${PF}"
 }
diff --git a/net-zope/plone/plone-2.0.4.ebuild b/net-zope/plone/plone-2.0.4.ebuild
index dec861664720..8d119115684c 100644
--- a/net-zope/plone/plone-2.0.4.ebuild
+++ b/net-zope/plone/plone-2.0.4.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.4.ebuild,v 1.6 2005/11/14 13:38:11 seemant Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.4.ebuild,v 1.7 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
+SLOT="2.0"
+KEYWORDS="~amd64 ppc x86"
+
 RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/zope-2.7
 	>=net-zope/btreefolder2-1.0.1
@@ -27,7 +27,6 @@ RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/portaltransforms-1.0.4
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
-	>=app-admin/zope-config-0.4
-	${RDEPEND}"
+	>=app-admin/zope-config-0.4"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.5-r1.ebuild b/net-zope/plone/plone-2.0.5-r1.ebuild
index 682ba1338902..f8ed70c9a4f9 100644
--- a/net-zope/plone/plone-2.0.5-r1.ebuild
+++ b/net-zope/plone/plone-2.0.5-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5-r1.ebuild,v 1.4 2005/05/06 03:35:24 swegener Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5-r1.ebuild,v 1.5 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 RDEPEND="=net-zope/cmf-1.4*
 	=net-zope/zope-2.7*
 	>=net-zope/btreefolder2-1.0.1
@@ -28,7 +28,6 @@ RDEPEND="=net-zope/cmf-1.4*
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
 	>=app-admin/zope-config-0.5
-	>=dev-lang/python-2.3
-	${RDEPEND}"
+	>=dev-lang/python-2.3"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.5.ebuild b/net-zope/plone/plone-2.0.5.ebuild
index c88bb0bff051..22ec47026893 100644
--- a/net-zope/plone/plone-2.0.5.ebuild
+++ b/net-zope/plone/plone-2.0.5.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5.ebuild,v 1.4 2005/05/06 03:35:24 swegener Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5.ebuild,v 1.5 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/zope-2.7
 	>=net-zope/btreefolder2-1.0.1
@@ -28,7 +28,6 @@ RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
 	>=app-admin/zope-config-0.5
-	>=dev-lang/python-2.3
-	${RDEPEND}"
+	>=dev-lang/python-2.3"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.ebuild b/net-zope/plone/plone-2.0.ebuild
index 1daeac5fb45f..5f2a7da96e06 100644
--- a/net-zope/plone/plone-2.0.ebuild
+++ b/net-zope/plone/plone-2.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.ebuild,v 1.3 2004/07/24 22:56:26 batlogg Exp $
-
-SLOT="2.0"
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.ebuild,v 1.4 2006/01/27 02:41:36 vapier Exp $
 
 inherit zproduct
 
-DESCRIPTION="A Zope Content Management System, based on Zope CMF."
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-2.0-final.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="2.0"
 KEYWORDS="~x86"
-IUSE=""
+
 RDEPEND=">=net-zope/cmf-1.4.2
 	>=net-zope/btreefolder2-1.0
 	>=net-zope/cmfactionicons-0.9
@@ -25,7 +25,6 @@ RDEPEND=">=net-zope/cmf-1.4.2
 	>=net-zope/archetypes-1.2.5_rc4
 	>=net-zope/portaltransforms-1.0.3
 	>=net-zope/externaleditor-0.7
-	>=net-zope/epoz-0.8.0
-	${RDEPEND}"
+	>=net-zope/epoz-0.8.0"
 
 ZPROD_LIST="CMFPlone"