misc touchups

(Portage version: 2.1_pre3-r1)

4 files changed, 29 insertions, 31 deletions

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"