Fix KEYWORDS.

(Portage version: 2.0.52-r1)

76 files changed, 173 insertions, 168 deletions

diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.1-r1.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.1-r1.ebuild
index 546d90cee482..ae67d02f8044 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.1-r1.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.1-r1.ebuild,v 1.1 2005/09/08 05:54:49 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Tar file management class"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Auth/PEAR-Auth-1.2.3-r1.ebuild b/dev-php/PEAR-Auth/PEAR-Auth-1.2.3-r1.ebuild
index 2fbdd8426326..3661818b9df2 100644
--- a/dev-php/PEAR-Auth/PEAR-Auth-1.2.3-r1.ebuild
+++ b/dev-php/PEAR-Auth/PEAR-Auth-1.2.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Auth/PEAR-Auth-1.2.3-r1.ebuild,v 1.1 2005/09/08 07:26:50 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Auth/PEAR-Auth-1.2.3-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Provides methods for creating an authentication system using PHP."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND="dev-php/PEAR-PEAR
 		dev-php/PEAR-DB"
diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.0.1-r1.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.0.1-r1.ebuild
index e3994d50f264..a719886d97df 100644
--- a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.0.1-r1.ebuild
+++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.0.1-r1.ebuild,v 1.1 2005/09/08 07:27:40 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.0.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Abstraction of various SASL mechanism responses"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.2-r1.ebuild b/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.2-r1.ebuild
index 517b39744858..3c86a9498dd5 100644
--- a/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.2-r1.ebuild
+++ b/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.2-r1.ebuild,v 1.1 2005/09/08 07:28:19 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Framework to benchmark PHP scripts or function calls."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.4-r1.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.4-r1.ebuild
index ecedd5cce454..164e32a22b44 100644
--- a/dev-php/PEAR-Cache/PEAR-Cache-1.5.4-r1.ebuild
+++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache/PEAR-Cache-1.5.4-r1.ebuild,v 1.1 2005/09/08 07:31:25 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache/PEAR-Cache-1.5.4-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Framework for caching of arbitrary data"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.5.2-r1.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.5.2-r1.ebuild
index be93563a455f..3be57a773494 100644
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.5.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.5.2-r1.ebuild,v 1.1 2005/09/08 07:33:21 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.5.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Fast and safe little cache system."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild
index 2588ec3d0e42..049532ccedae 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild,v 1.1 2005/09/08 05:56:01 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Command-line option parser"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.0.2-r1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.0.2-r1.ebuild
index 9c7f7623bb72..be880d3bf665 100644
--- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.0.2-r1.ebuild
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.0.2-r1.ebuild,v 1.1 2005/09/08 07:34:01 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.0.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Class that makes it easy to build console style tables."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Crypt_RC4/PEAR-Crypt_RC4-1.0.2-r1.ebuild b/dev-php/PEAR-Crypt_RC4/PEAR-Crypt_RC4-1.0.2-r1.ebuild
index cd5a51f9a814..1a27e2489712 100644
--- a/dev-php/PEAR-Crypt_RC4/PEAR-Crypt_RC4-1.0.2-r1.ebuild
+++ b/dev-php/PEAR-Crypt_RC4/PEAR-Crypt_RC4-1.0.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Crypt_RC4/PEAR-Crypt_RC4-1.0.2-r1.ebuild,v 1.1 2005/09/08 07:34:42 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Crypt_RC4/PEAR-Crypt_RC4-1.0.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Encryption class for RC4 encryption."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.7.6-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.7.6-r1.ebuild
index f4b7ef41b851..a132edd47944 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.7.6-r1.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB/PEAR-DB-1.7.6-r1.ebuild,v 1.1 2005/09/08 07:35:23 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB/PEAR-DB-1.7.6-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Database abstraction layer for PHP"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.7.15-r1.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.7.15-r1.ebuild
index bdb75085d708..c42bd662a7c6 100644
--- a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.7.15-r1.ebuild
+++ b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.7.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.7.15-r1.ebuild,v 1.1 2005/09/08 07:36:05 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.7.15-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="An SQL Builder, Object Interface to Database Tables."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-DB-1.7.0
 	>=dev-php/PEAR-Date-1.4.3
diff --git a/dev-php/PEAR-DB_Table/PEAR-DB_Table-0.21.2-r1.ebuild b/dev-php/PEAR-DB_Table/PEAR-DB_Table-0.21.2-r1.ebuild
index 1bb5452e07ab..885ff0acec50 100644
--- a/dev-php/PEAR-DB_Table/PEAR-DB_Table-0.21.2-r1.ebuild
+++ b/dev-php/PEAR-DB_Table/PEAR-DB_Table-0.21.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB_Table/PEAR-DB_Table-0.21.2-r1.ebuild,v 1.1 2005/09/08 07:36:43 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB_Table/PEAR-DB_Table-0.21.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Builds on PEAR DB to abstract datatypes and automate table creation, data validation"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND="dev-php/PEAR-Date"
diff --git a/dev-php/PEAR-Date/PEAR-Date-1.4.3-r1.ebuild b/dev-php/PEAR-Date/PEAR-Date-1.4.3-r1.ebuild
index 634ee26f3163..770a9e686a7a 100644
--- a/dev-php/PEAR-Date/PEAR-Date-1.4.3-r1.ebuild
+++ b/dev-php/PEAR-Date/PEAR-Date-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Date/PEAR-Date-1.4.3-r1.ebuild,v 1.1 2005/09/08 07:37:22 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Date/PEAR-Date-1.4.3-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Date and Time Zone Classes"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-File/PEAR-File-1.0.3-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.0.3-r1.ebuild
index 24ee289cfcf3..a7b6cfa9489f 100644
--- a/dev-php/PEAR-File/PEAR-File-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File/PEAR-File-1.0.3-r1.ebuild,v 1.1 2005/09/08 07:38:01 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File/PEAR-File-1.0.3-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Common file and directory routines"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-0.2.0-r1.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-0.2.0-r1.ebuild
index af4769b0d876..b38de3bfb6c1 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-0.2.0-r1.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-0.2.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File_Find/PEAR-File_Find-0.2.0-r1.ebuild,v 1.1 2005/09/08 07:38:44 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File_Find/PEAR-File_Find-0.2.0-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="A class that facillitates the search of filesystems."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.1-r1.ebuild b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.1-r1.ebuild
index 7bceb25a42f3..feaa67254425 100644
--- a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.1-r1.ebuild
+++ b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.1-r1.ebuild,v 1.1 2005/09/08 07:39:26 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Base class for other HTML classes."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.0-r1.ebuild b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.0-r1.ebuild
index 81b576600726..61bb3ff421f4 100644
--- a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.0-r1.ebuild
+++ b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.0-r1.ebuild,v 1.1 2005/09/08 07:40:07 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.0-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,4 @@ IUSE=""
 DESCRIPTION="Provides an interface for creating simple JS scripts within PHP"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
+KEYWORDS="~x86"
diff --git a/dev-php/PEAR-HTML_QuickForm/PEAR-HTML_QuickForm-3.2.3-r1.ebuild b/dev-php/PEAR-HTML_QuickForm/PEAR-HTML_QuickForm-3.2.3-r1.ebuild
index 6d43c167f517..7ca3341ec98a 100644
--- a/dev-php/PEAR-HTML_QuickForm/PEAR-HTML_QuickForm-3.2.3-r1.ebuild
+++ b/dev-php/PEAR-HTML_QuickForm/PEAR-HTML_QuickForm-3.2.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_QuickForm/PEAR-HTML_QuickForm-3.2.3-r1.ebuild,v 1.1 2005/09/08 07:40:50 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_QuickForm/PEAR-HTML_QuickForm-3.2.3-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="The PEAR::HTML_QuickForm package provides methods for creating, validating, processing HTML forms."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 DEPEND=">=dev-php/PEAR-HTML_Common-1.2.1
 		dev-php/PEAR-HTML_Template_Flexy
 		dev-php/PEAR-HTML_Template_IT"
diff --git a/dev-php/PEAR-HTML_Select_Common/PEAR-HTML_Select_Common-1.1-r2.ebuild b/dev-php/PEAR-HTML_Select_Common/PEAR-HTML_Select_Common-1.1-r2.ebuild
index 0fbdcd8427c3..4e61a82eb247 100644
--- a/dev-php/PEAR-HTML_Select_Common/PEAR-HTML_Select_Common-1.1-r2.ebuild
+++ b/dev-php/PEAR-HTML_Select_Common/PEAR-HTML_Select_Common-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Select_Common/PEAR-HTML_Select_Common-1.1-r2.ebuild,v 1.1 2005/09/08 07:41:30 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Select_Common/PEAR-HTML_Select_Common-1.1-r2.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ IUSE=""
 DESCRIPTION="Some small classes to handle common <select> lists"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 DEPEND=">=dev-php/PEAR-I18N-0.8"
diff --git a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.5-r1.ebuild b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.5-r1.ebuild
index edd4ab0b0b22..f3419fdcd357 100644
--- a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.5-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.5-r1.ebuild,v 1.1 2005/09/08 07:42:11 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.5-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,6 +8,6 @@ DESCRIPTION="Makes the design of HTML tables easy, flexible, reusable and effici
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-HTML_Common-1.2"
diff --git a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.7-r1.ebuild b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.7-r1.ebuild
index f7ce6bcc5a21..baf7b1d678bc 100644
--- a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.7-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.7-r1.ebuild,v 1.1 2005/09/08 07:42:52 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.7-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="Autofill a table with data."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND="dev-php/PEAR-HTML_Table
 	dev-php/PEAR-Numbers_Words"
diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.2.1-r1.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.2.1-r1.ebuild
index 4ac4845aa257..f2ae8e1f9275 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.2.1-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.2.1-r1.ebuild,v 1.1 2005/09/08 07:43:32 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.2.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ IUSE="javascript"
 DESCRIPTION="An extremely powerful Tokenizer driven Template engine"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 DEPEND="javascript? ( >=dev-php/PEAR-HTML_Javascript-1.1.0 )"
diff --git a/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.1-r1.ebuild b/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.1-r1.ebuild
index c1f0e59f2d60..20b17dc11c7f 100644
--- a/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.1-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.1-r1.ebuild,v 1.1 2005/09/08 07:44:12 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Integrated Templates"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.1.2-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.1.2-r1.ebuild
index cc3865885cdc..41e7e013fa19 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.1.2-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.1.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.1.2-r1.ebuild,v 1.1 2005/09/08 07:44:53 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.1.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.0-r1.ebuild b/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.0-r1.ebuild
index 8b186d2f002d..2b21d0a1ae74 100644
--- a/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.0-r1.ebuild
+++ b/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.0-r1.ebuild,v 1.1 2005/09/08 07:45:33 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.0-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Provides an API to create a HTML tree."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.3.4-r1.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.3.4-r1.ebuild
index cf141c5e6e42..76086caf8051 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.3.4-r1.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.3.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP/PEAR-HTTP-1.3.4-r1.ebuild,v 1.1 2005/09/08 07:46:12 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP/PEAR-HTTP-1.3.4-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Miscellaneous HTTP utilities."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-HTTP_Request/PEAR-HTTP_Request-1.2.4-r1.ebuild b/dev-php/PEAR-HTTP_Request/PEAR-HTTP_Request-1.2.4-r1.ebuild
index 1a6f8d0ed4a1..1bf3edf1b862 100644
--- a/dev-php/PEAR-HTTP_Request/PEAR-HTTP_Request-1.2.4-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request/PEAR-HTTP_Request-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP_Request/PEAR-HTTP_Request-1.2.4-r1.ebuild,v 1.1 2005/09/08 07:46:51 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP_Request/PEAR-HTTP_Request-1.2.4-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-Net_URL-1.0.12
diff --git a/dev-php/PEAR-HTTP_WebDAV_Server/PEAR-HTTP_WebDAV_Server-0.99.1-r1.ebuild b/dev-php/PEAR-HTTP_WebDAV_Server/PEAR-HTTP_WebDAV_Server-0.99.1-r1.ebuild
index 868ba432a2ad..6856bf04c3a1 100644
--- a/dev-php/PEAR-HTTP_WebDAV_Server/PEAR-HTTP_WebDAV_Server-0.99.1-r1.ebuild
+++ b/dev-php/PEAR-HTTP_WebDAV_Server/PEAR-HTTP_WebDAV_Server-0.99.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP_WebDAV_Server/PEAR-HTTP_WebDAV_Server-0.99.1-r1.ebuild,v 1.1 2005/09/08 07:47:30 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP_WebDAV_Server/PEAR-HTTP_WebDAV_Server-0.99.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="WebDAV Server Baseclass."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-HTTP-1.0"
diff --git a/dev-php/PEAR-I18N/PEAR-I18N-0.8.6-r2.ebuild b/dev-php/PEAR-I18N/PEAR-I18N-0.8.6-r2.ebuild
index ef0391866c44..a03b5d47dcc6 100644
--- a/dev-php/PEAR-I18N/PEAR-I18N-0.8.6-r2.ebuild
+++ b/dev-php/PEAR-I18N/PEAR-I18N-0.8.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-I18N/PEAR-I18N-0.8.6-r2.ebuild,v 1.1 2005/09/08 07:48:14 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-I18N/PEAR-I18N-0.8.6-r2.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ IUSE=""
 DESCRIPTION="Adds internationalization support to PHP applications"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 DEPEND="dev-php/PEAR-HTML_Template_IT"
diff --git a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r1.ebuild b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r1.ebuild
index b1f6ce42b9b6..990a991f20b7 100644
--- a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r1.ebuild
+++ b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r1.ebuild,v 1.1 2005/09/08 07:48:54 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="This package provides a mechanism for modifying IPTC header information"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.8.7-r1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.8.7-r1.ebuild
index bcfc9ffc4c9c..7f811d6d32ae 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.8.7-r1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.8.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Log/PEAR-Log-1.8.7-r1.ebuild,v 1.1 2005/09/08 07:49:33 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Log/PEAR-Log-1.8.7-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="The Log framework provides an abstracted logging system supporting
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="dev-php/PEAR-DB"
diff --git a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r1.ebuild b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r1.ebuild
index 68989592b853..2d0b9c59af8d 100644
--- a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r1.ebuild,v 1.1 2005/09/08 07:50:15 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="PEAR MDB is a merge of the PEAR DB and Metabase php database abstraction layers."
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.1.6-r1.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.1.6-r1.ebuild
index 0c253588d53c..381f78a53821 100644
--- a/dev-php/PEAR-Mail/PEAR-Mail-1.1.6-r1.ebuild
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail/PEAR-Mail-1.1.6-r1.ebuild,v 1.1 2005/09/08 07:50:55 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail/PEAR-Mail-1.1.6-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="Class that provides multiple interfaces for sending emails"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-Net_SMTP-1.1.0"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r1.ebuild
index 8e84f907fdf3..f81c3d712d19 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r1.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r1.ebuild,v 1.1 2005/09/08 07:51:36 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r1.ebuild,v 1.2 2005/09/09 14:21:30 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Provides classes to deal with creation and manipulation of mime mes
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Math_Stats/PEAR-Math_Stats-0.9.0_beta3-r1.ebuild b/dev-php/PEAR-Math_Stats/PEAR-Math_Stats-0.9.0_beta3-r1.ebuild
index bbfa6781d642..5946a49cfb4c 100644
--- a/dev-php/PEAR-Math_Stats/PEAR-Math_Stats-0.9.0_beta3-r1.ebuild
+++ b/dev-php/PEAR-Math_Stats/PEAR-Math_Stats-0.9.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Math_Stats/PEAR-Math_Stats-0.9.0_beta3-r1.ebuild,v 1.1 2005/09/08 07:52:16 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Math_Stats/PEAR-Math_Stats-0.9.0_beta3-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -9,5 +9,5 @@ SRC_URI="http://pear.php.net/get/Math_Stats-0.9.0beta3.tgz"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_CheckIP/PEAR-Net_CheckIP-1.1-r1.ebuild b/dev-php/PEAR-Net_CheckIP/PEAR-Net_CheckIP-1.1-r1.ebuild
index 162f5650a07a..aa6cae7c7e88 100644
--- a/dev-php/PEAR-Net_CheckIP/PEAR-Net_CheckIP-1.1-r1.ebuild
+++ b/dev-php/PEAR-Net_CheckIP/PEAR-Net_CheckIP-1.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_CheckIP/PEAR-Net_CheckIP-1.1-r1.ebuild,v 1.1 2005/09/08 07:52:55 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_CheckIP/PEAR-Net_CheckIP-1.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Check the syntax of IPv4 addresses."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-0.3-r1.ebuild b/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-0.3-r1.ebuild
index e7dcb39bb089..fc4bace71f7e 100644
--- a/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-0.3-r1.ebuild
+++ b/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-0.3-r1.ebuild,v 1.1 2005/09/08 07:53:34 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-0.3-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="The PEAR::Net_DIME class implements DIME encoding"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-0.03-r1.ebuild b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-0.03-r1.ebuild
index e1aa032b4a53..4d8e6eb28f83 100644
--- a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-0.03-r1.ebuild
+++ b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-0.03-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-0.03-r1.ebuild,v 1.1 2005/09/08 07:54:13 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-0.03-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Resolver library used to communicate with a DNS server."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.0.0-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.0.0-r1.ebuild
index c86826fae346..870868bccc65 100644
--- a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.0.0-r1.ebuild
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.0.0-r1.ebuild,v 1.1 2005/09/08 07:54:52 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.0.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="DNSBL Checker"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 RDEPEND="${RDEPEND}
 	>=dev-php/PEAR-Cache_Lite-1.3.1
diff --git a/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.0.3-r1.ebuild b/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.0.3-r1.ebuild
index fd84be2b74b3..5b71aae3fb12 100644
--- a/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.0.3-r1.ebuild,v 1.1 2005/09/08 07:55:32 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.0.3-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,6 +8,6 @@ DESCRIPTION="Provides an implementation of the IMAP protocol."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND="dev-php/PEAR-Net_Socket"
+RDEPEND="${RDEPEND} dev-php/PEAR-Net_Socket"
diff --git a/dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.1-r1.ebuild b/dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.1-r1.ebuild
index 4be2fc9b87b2..bfcb087a8a19 100644
--- a/dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.1-r1.ebuild
+++ b/dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.1-r1.ebuild,v 1.1 2005/09/08 07:56:12 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,6 +8,6 @@ DESCRIPTION="Provides an implementation of the RFC2033 LMTP protocol."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND="dev-php/PEAR-Net_Socket"
+RDEPEND="${RDEPEND} dev-php/PEAR-Net_Socket"
diff --git a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.6-r1.ebuild b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.6-r1.ebuild
index 83e754ddd4d1..040f04457c18 100644
--- a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.6-r1.ebuild
+++ b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.6-r1.ebuild,v 1.1 2005/09/08 07:56:51 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.6-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,6 +8,6 @@ DESCRIPTION="Provides a POP3 class to access POP3 server."
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND="dev-php/PEAR-Net_Socket"
+RDEPEND="${RDEPEND} dev-php/PEAR-Net_Socket"
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.2.6-r1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.2.6-r1.ebuild
index 67e934a705f9..e200c7123f36 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.2.6-r1.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.2.6-r1.ebuild,v 1.1 2005/09/08 07:57:32 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.2.6-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,8 +8,9 @@ DESCRIPTION="Tar file management class"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND="dev-php/PEAR-Auth_SASL
+RDEPEND="${RDEPEND}
+	dev-php/PEAR-Auth_SASL
 	dev-php/PEAR-Net_Socket"
diff --git a/dev-php/PEAR-Net_Server/PEAR-Net_Server-0.12.0-r1.ebuild b/dev-php/PEAR-Net_Server/PEAR-Net_Server-0.12.0-r1.ebuild
index f0f23f405936..9da26000e3bc 100644
--- a/dev-php/PEAR-Net_Server/PEAR-Net_Server-0.12.0-r1.ebuild
+++ b/dev-php/PEAR-Net_Server/PEAR-Net_Server-0.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_Server/PEAR-Net_Server-0.12.0-r1.ebuild,v 1.1 2005/09/08 07:58:11 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_Server/PEAR-Net_Server-0.12.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Generic server class for PHP."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.1.1-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.1.1-r1.ebuild
index 96a8981ac018..1e9b53d6cb34 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.1.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.1.1-r1.ebuild,v 1.1 2005/09/08 07:58:50 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.1.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Provides an API to talk to the timsieved server that comes with Cyrus IMAPd. Can be used to install, remove, mark active etc sieve scripts."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.0"
+RDEPEND="${RDEPEND} >=dev-php/PEAR-Net_Socket-1.0.0"
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-0.5.5_p1-r1.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-0.5.5_p1-r1.ebuild
index 93f7740c6a54..707d3a12fe60 100644
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-0.5.5_p1-r1.ebuild
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-0.5.5_p1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-0.5.5_p1-r1.ebuild,v 1.1 2005/09/08 07:59:30 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-0.5.5_p1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Net_SmartIRC is a PHP class for communication with IRC networks"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.6-r1.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.6-r1.ebuild
index 42f86081258e..b39a1b73bf56 100644
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.6-r1.ebuild
+++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.6-r1.ebuild,v 1.1 2005/09/08 08:00:08 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.6-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="class interface to TCP sockets"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.14-r1.ebuild b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.14-r1.ebuild
index edecc236f72f..11a708493f07 100644
--- a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.14-r1.ebuild
+++ b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.14-r1.ebuild,v 1.1 2005/09/08 08:00:48 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.14-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Easy parsing of URLs"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.1.0-r1.ebuild b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.1.0-r1.ebuild
index 282813bccdc6..db0f086d8884 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.1.0-r1.ebuild
+++ b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.1.0-r1.ebuild,v 1.1 2005/09/08 08:01:26 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.1.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -9,5 +9,5 @@ platform from an HTTP user agent string."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.13.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.13.1-r1.ebuild
index 3b59620327f9..91a16af47ec4 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.13.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.13.1-r1.ebuild,v 1.1 2005/09/08 08:02:07 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.13.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Provides methods for spelling numerals in words."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild
index 5f38295a69db..6d61fc9628af 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild,v 1.1 2005/09/08 08:02:48 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Package for reading and writing OLE containers"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild
index 64acd8457162..2f5b2342d410 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild,v 1.2 2005/09/08 05:58:53 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild,v 1.3 2005/09/09 14:21:31 sebastian Exp $
 
 inherit depend.php
 
@@ -20,7 +20,7 @@ SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 # we deliberately force people to remove their old PEAR installations,
diff --git a/dev-php/PEAR-PEAR_Info/PEAR-PEAR_Info-1.5.2-r1.ebuild b/dev-php/PEAR-PEAR_Info/PEAR-PEAR_Info-1.5.2-r1.ebuild
index 2ec33ac3b6eb..7aa9dfaac160 100644
--- a/dev-php/PEAR-PEAR_Info/PEAR-PEAR_Info-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-PEAR_Info/PEAR-PEAR_Info-1.5.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR_Info/PEAR-PEAR_Info-1.5.2-r1.ebuild,v 1.1 2005/09/08 08:03:27 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR_Info/PEAR-PEAR_Info-1.5.2-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Show Information about your PEAR install and its packages"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-PHPUnit/PEAR-PHPUnit-1.3.0-r1.ebuild b/dev-php/PEAR-PHPUnit/PEAR-PHPUnit-1.3.0-r1.ebuild
index b5f7e2ef7b8f..b730cd11735e 100644
--- a/dev-php/PEAR-PHPUnit/PEAR-PHPUnit-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-PHPUnit/PEAR-PHPUnit-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PHPUnit/PEAR-PHPUnit-1.3.0-r1.ebuild,v 1.1 2005/09/08 08:04:05 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PHPUnit/PEAR-PHPUnit-1.3.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Unit Testing framework for PHP 4."
 HOMEPAGE="http://www.phpunit.de/"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.3.3-r1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.3.3-r1.ebuild
index 543d6c023676..f6ae6e53a0db 100644
--- a/dev-php/PEAR-Pager/PEAR-Pager-2.3.3-r1.ebuild
+++ b/dev-php/PEAR-Pager/PEAR-Pager-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Pager/PEAR-Pager-2.3.3-r1.ebuild,v 1.1 2005/09/08 08:04:44 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Pager/PEAR-Pager-2.3.3-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Data paging class."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.3.0_rc3-r1.ebuild b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.3.0_rc3-r1.ebuild
index bd9508fdacfc..fa6ac7965540 100644
--- a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.3.0_rc3-r1.ebuild
+++ b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.3.0_rc3-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.3.0_rc3-r1.ebuild,v 1.1 2005/09/08 08:05:45 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.3.0_rc3-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="The phpDocumentor package provides automatic documenting of php api directly from the source."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-SOAP/PEAR-SOAP-0.8.1-r1.ebuild b/dev-php/PEAR-SOAP/PEAR-SOAP-0.8.1-r1.ebuild
index 8561b81255e6..c8740636dcc5 100644
--- a/dev-php/PEAR-SOAP/PEAR-SOAP-0.8.1-r1.ebuild
+++ b/dev-php/PEAR-SOAP/PEAR-SOAP-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-SOAP/PEAR-SOAP-0.8.1-r1.ebuild,v 1.1 2005/09/08 08:06:26 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-SOAP/PEAR-SOAP-0.8.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,10 +8,11 @@ DESCRIPTION="SOAP Client/Server for PHP 4"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND="dev-php/PEAR-HTTP_Request
+RDEPEND="${RDEPEND}
+	dev-php/PEAR-HTTP_Request
 	dev-php/PEAR-Mail_Mime
 	dev-php/PEAR-Net_URL
 	dev-php/PEAR-Net_DIME"
diff --git a/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild b/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild
index 93f881ffeb1a..6a4c7988f21d 100644
--- a/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild
+++ b/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild,v 1.1 2005/09/08 08:07:10 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,10 +8,11 @@ DESCRIPTION="This class acts as an interface to various online weather-services.
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND=">=dev-php/PEAR-Cache-1.5.3
+RDEPEND="${RDEPEND}
+	>=dev-php/PEAR-Cache-1.5.3
 	>=dev-php/PEAR-DB-1.4
 	>=dev-php/PEAR-HTTP_Request-1.2
 	>=dev-php/PEAR-SOAP-0.7.5
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.8-r1.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.8-r1.ebuild
index 30f1b1df3ab1..b2d08f7852ed 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.8-r1.ebuild
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.8-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.8-r1.ebuild,v 1.1 2005/09/08 08:07:49 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.8-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Package for generating Excel spreadsheets"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-RDEPEND="dev-php/PEAR-OLE"
+KEYWORDS="~x86"
+RDEPEND="${RDEPEND} dev-php/PEAR-OLE"
 IUSE=""
diff --git a/dev-php/PEAR-Structures_DataGrid/PEAR-Structures_DataGrid-0.6.2-r1.ebuild b/dev-php/PEAR-Structures_DataGrid/PEAR-Structures_DataGrid-0.6.2-r1.ebuild
index b87ed85529fa..3db8508d7f53 100644
--- a/dev-php/PEAR-Structures_DataGrid/PEAR-Structures_DataGrid-0.6.2-r1.ebuild
+++ b/dev-php/PEAR-Structures_DataGrid/PEAR-Structures_DataGrid-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_DataGrid/PEAR-Structures_DataGrid-0.6.2-r1.ebuild,v 1.1 2005/09/08 08:08:33 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_DataGrid/PEAR-Structures_DataGrid-0.6.2-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -9,9 +9,10 @@ and sorting purposes."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND=">=dev-php/PEAR-HTML_Table-1.5
+RDEPEND="${RDEPEND}
+	>=dev-php/PEAR-HTML_Table-1.5
 	>=dev-php/PEAR-Pager-2.2
 	>=dev-php/PEAR-Spreadsheet_Excel_Writer-0.6
 	>=dev-php/PEAR-XML_Util-0.5.2
diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.1-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.1-r1.ebuild
index d0d470f1943c..12004accf613 100644
--- a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.1-r1.ebuild
+++ b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.1-r1.ebuild,v 1.1 2005/09/08 08:09:16 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="PEAR::System_Command is a commandline execution interface"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Text_Diff/PEAR-Text_Diff-0.1.1-r1.ebuild b/dev-php/PEAR-Text_Diff/PEAR-Text_Diff-0.1.1-r1.ebuild
index ae26318af84c..051d07db3f05 100644
--- a/dev-php/PEAR-Text_Diff/PEAR-Text_Diff-0.1.1-r1.ebuild
+++ b/dev-php/PEAR-Text_Diff/PEAR-Text_Diff-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Diff/PEAR-Text_Diff-0.1.1-r1.ebuild,v 1.1 2005/09/08 08:09:54 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Diff/PEAR-Text_Diff-0.1.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Engine for performing and rendering text diffs."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.0-r1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.0-r1.ebuild
index cc403cb579a1..fd3c728d82f1 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.0-r1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.0-r1.ebuild,v 1.1 2005/09/08 08:10:35 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Creating passwords with PHP."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.0.0-r1.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.0.0-r1.ebuild
index 233b8bbc0199..472df89d8340 100644
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.0.0-r1.ebuild
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.0.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.0.0-r1.ebuild,v 1.1 2005/09/08 08:11:16 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.0.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Tree/PEAR-Tree-0.2.4-r1.ebuild b/dev-php/PEAR-Tree/PEAR-Tree-0.2.4-r1.ebuild
index 6916ecd2f027..6d69752c8113 100644
--- a/dev-php/PEAR-Tree/PEAR-Tree-0.2.4-r1.ebuild
+++ b/dev-php/PEAR-Tree/PEAR-Tree-0.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Tree/PEAR-Tree-0.2.4-r1.ebuild,v 1.1 2005/09/08 08:11:56 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Tree/PEAR-Tree-0.2.4-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,8 @@ DESCRIPTION="Generic tree management, currently supports DB and XML as data
 sources."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND=">=dev-php/PEAR-DB-1.3
-		>=dev-php/PEAR-XML_Parser-1.0"
+RDEPEND="${RDEPEND}
+	>=dev-php/PEAR-DB-1.3
+	>=dev-php/PEAR-XML_Parser-1.0"
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.5.0-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.5.0-r1.ebuild
index ade2b2651d6c..609d419949a0 100644
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.5.0-r1.ebuild
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Validate/PEAR-Validate-0.5.0-r1.ebuild,v 1.1 2005/09/08 08:12:37 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Validate/PEAR-Validate-0.5.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,6 +8,6 @@ DESCRIPTION="Validation class."
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND="dev-php/PEAR-Date"
+RDEPEND="${RDEPEND} dev-php/PEAR-Date"
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.3.0_alpha1-r1.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.3.0_alpha1-r1.ebuild
index 0ed3bd347405..8dba37da370e 100644
--- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.3.0_alpha1-r1.ebuild
+++ b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.3.0_alpha1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.3.0_alpha1-r1.ebuild,v 1.1 2005/09/08 08:13:18 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.3.0_alpha1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND=">=dev-php/PEAR-XML_Parser-1.0.1"
+RDEPEND="${RDEPEND} >=dev-php/PEAR-XML_Parser-1.0.1"
diff --git a/dev-php/PEAR-XML_Beautifier/PEAR-XML_Beautifier-1.1-r1.ebuild b/dev-php/PEAR-XML_Beautifier/PEAR-XML_Beautifier-1.1-r1.ebuild
index 80a01e02a34a..32d400e14338 100644
--- a/dev-php/PEAR-XML_Beautifier/PEAR-XML_Beautifier-1.1-r1.ebuild
+++ b/dev-php/PEAR-XML_Beautifier/PEAR-XML_Beautifier-1.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Beautifier/PEAR-XML_Beautifier-1.1-r1.ebuild,v 1.1 2005/09/08 08:13:57 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Beautifier/PEAR-XML_Beautifier-1.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="XML_Beautifier will add indentation and linebreaks to you XML files, replace all entities, format your comments and makes your document easier to read."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-XML_CSSML/PEAR-XML_CSSML-1.1-r3.ebuild b/dev-php/PEAR-XML_CSSML/PEAR-XML_CSSML-1.1-r3.ebuild
index e7680f353111..c3d1e14f6425 100644
--- a/dev-php/PEAR-XML_CSSML/PEAR-XML_CSSML-1.1-r3.ebuild
+++ b/dev-php/PEAR-XML_CSSML/PEAR-XML_CSSML-1.1-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_CSSML/PEAR-XML_CSSML-1.1-r3.ebuild,v 1.1 2005/09/08 08:14:36 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_CSSML/PEAR-XML_CSSML-1.1-r3.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="A template system for generating cascading style sheets (CSS)"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 src_unpack() {
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.2.4-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.2.4-r1.ebuild
index 037a12082493..b86b9f939333 100644
--- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.2.4-r1.ebuild
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.2.4-r1.ebuild,v 1.1 2005/09/08 08:15:15 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.2.4-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.1.ebuild b/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.1.ebuild
index c6c4c954c48f..6de3f79ebba4 100644
--- a/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.1.ebuild
+++ b/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.1.ebuild,v 1.2 2005/09/08 05:56:51 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.1.ebuild,v 1.3 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="PHP implementation of the XML-RPC protocol"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-0.9.2-r1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-0.9.2-r1.ebuild
index f761e48fdac5..1f17c7ee5a4e 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-0.9.2-r1.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-0.9.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-0.9.2-r1.ebuild,v 1.1 2005/09/08 08:15:55 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-0.9.2-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Parser for Resource Description Framework (RDF) Site Summary (RSS) documents."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.15.0-r1.ebuild b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.15.0-r1.ebuild
index 521a7e62841e..2c5182b556ba 100644
--- a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.15.0-r1.ebuild
+++ b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.15.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.15.0-r1.ebuild,v 1.1 2005/09/08 08:16:36 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.15.0-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,8 +8,9 @@ DESCRIPTION="Swiss-army knive for reading and writing XML files"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND=">=dev-php/PEAR-XML_Parser-1.2.1
+RDEPEND="${RDEPEND}
+	>=dev-php/PEAR-XML_Parser-1.2.1
 	>=dev-php/PEAR-XML_Util-1.1.1"
diff --git a/dev-php/PEAR-XML_Tree/PEAR-XML_Tree-2.0.0_rc2-r1.ebuild b/dev-php/PEAR-XML_Tree/PEAR-XML_Tree-2.0.0_rc2-r1.ebuild
index 5068a76aaeed..30fbe6bac37d 100644
--- a/dev-php/PEAR-XML_Tree/PEAR-XML_Tree-2.0.0_rc2-r1.ebuild
+++ b/dev-php/PEAR-XML_Tree/PEAR-XML_Tree-2.0.0_rc2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Tree/PEAR-XML_Tree-2.0.0_rc2-r1.ebuild,v 1.2 2005/09/08 10:56:56 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Tree/PEAR-XML_Tree-2.0.0_rc2-r1.ebuild,v 1.3 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="The XML_Tree package allows one to build XML data structures using a tree representation, without the need for an extension like DOMXML"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
-RDEPEND="dev-php/PEAR-XML_Parser"
+RDEPEND="${RDEPEND} dev-php/PEAR-XML_Parser"
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild
index 37da0fc05ad5..da35a6cc4c64 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild,v 1.1 2005/09/08 08:17:55 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="XML utility class"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
diff --git a/dev-php/PEAR-XML_XPath/PEAR-XML_XPath-1.2.1-r1.ebuild b/dev-php/PEAR-XML_XPath/PEAR-XML_XPath-1.2.1-r1.ebuild
index 160f476dcdb2..380b0e760b47 100644
--- a/dev-php/PEAR-XML_XPath/PEAR-XML_XPath-1.2.1-r1.ebuild
+++ b/dev-php/PEAR-XML_XPath/PEAR-XML_XPath-1.2.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_XPath/PEAR-XML_XPath-1.2.1-r1.ebuild,v 1.1 2005/09/08 08:18:36 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_XPath/PEAR-XML_XPath-1.2.1-r1.ebuild,v 1.2 2005/09/09 14:21:31 sebastian Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="The PEAR::XML_XPath class provided an XPath/DOM XML manipulation, maneuvering and query interface"
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 pkg_postinst () {