amd64 keyword on 1.26, fix LICENSE syntax

6 files changed, 18 insertions, 15 deletions

diff --git a/dev-perl/HTML-Mason/ChangeLog b/dev-perl/HTML-Mason/ChangeLog
index 99790cc1bbc2..58da4cfdae3c 100644
--- a/dev-perl/HTML-Mason/ChangeLog
+++ b/dev-perl/HTML-Mason/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/HTML-Mason
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/ChangeLog,v 1.22 2004/09/28 19:46:30 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/ChangeLog,v 1.23 2004/10/16 22:24:01 rac Exp $
+
+  16 Oct 2004; Robert Coie <rac@gentoo.org> HTML-Mason-1.26.ebuild:
+  keyword amd64
 
 *HTML-Mason-1.26 (28 Sep 2004)
 
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.20.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.20.ebuild
index 4fbdb289e3eb..18d69e42d8ce 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.20.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.20.ebuild,v 1.10 2004/09/03 17:14:53 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.20.ebuild,v 1.11 2004/10/16 22:24:01 rac Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.masonhq.com/download/${P}.tar.gz"
 HOMEPAGE="http://www.masonhq.com/"
 
 SLOT="0"
-LICENSE="Artistic | GPL-2"
+LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="x86 amd64 ppc ~sparc ~alpha"
 IUSE=""
 
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.22.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.22.ebuild
index c4f2d70f8c85..611550582fc3 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.22.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.22.ebuild,v 1.10 2004/09/03 17:14:53 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.22.ebuild,v 1.11 2004/10/16 22:24:01 rac Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.masonhq.com/download/${P}.tar.gz"
 HOMEPAGE="http://www.masonhq.com/"
 
 SLOT="0"
-LICENSE="Artistic | GPL-2"
+LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~x86 ~amd64 ppc sparc ~alpha"
 IUSE=""
 
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.25.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.25.ebuild
index c773a05cf624..7e1687d9f199 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.25.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.25.ebuild,v 1.6 2004/09/03 17:14:53 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.25.ebuild,v 1.7 2004/10/16 22:24:01 rac Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.masonhq.com/download/${P}.tar.gz"
 HOMEPAGE="http://www.masonhq.com/"
 
 SLOT="0"
-LICENSE="Artistic | GPL-2"
+LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~x86 ~amd64 ppc ~sparc alpha"
 IUSE=""
 
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.26.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.26.ebuild
index bd1b09a0119d..522c8c5f0ba0 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.26.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.26.ebuild,v 1.1 2004/09/28 19:46:30 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.26.ebuild,v 1.2 2004/10/16 22:24:01 rac Exp $
 
 inherit perl-module
 
@@ -9,8 +9,8 @@ SRC_URI="http://www.masonhq.com/download/${P}.tar.gz"
 HOMEPAGE="http://www.masonhq.com/"
 
 SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 9788b0f4c738..116cd72cbb61 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,9 +1,9 @@
-MD5 598d968a631fc24e652621f5eb0c917c ChangeLog 3741
-MD5 d4dd8fb58d8c77e544788333cfc59da1 HTML-Mason-1.20.ebuild 1738
-MD5 2293b350c039da0a753fa23c7312e1d1 HTML-Mason-1.22.ebuild 1739
-MD5 ece39a8287c3d1722167607ac7ea0fb1 HTML-Mason-1.25.ebuild 1738
+MD5 8fe529826663d8cc892f4056e45732b0 ChangeLog 3826
+MD5 66cff1126d3cb4058152fa74b494d9b7 HTML-Mason-1.20.ebuild 1738
+MD5 de7d755be0da699b72c78973ba24d476 HTML-Mason-1.22.ebuild 1739
+MD5 c706012ac2458feec8844ba7d685a801 HTML-Mason-1.25.ebuild 1738
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 1b6ee57b35223fceb6562fbdc021b862 HTML-Mason-1.26.ebuild 1735
+MD5 d95836fa3e62d4ea5cde36f39a85da33 HTML-Mason-1.26.ebuild 1739
 MD5 ab2c0618efa7e72fc2bf1f5c32002058 files/digest-HTML-Mason-1.20 67
 MD5 1fc7a530b801966564b7dc476e5146da files/digest-HTML-Mason-1.22 67
 MD5 07de1ec3aa725a31db3b84f7a98cabda files/digest-HTML-Mason-1.25 67