mondo amd64 commit (keywords, misc things here and there)

470 files changed, 945 insertions, 956 deletions

diff --git a/sys-apps/aboot/aboot-0.9-r1.ebuild b/sys-apps/aboot/aboot-0.9-r1.ebuild
index e7eaa9342333..be63806f5c72 100644
--- a/sys-apps/aboot/aboot-0.9-r1.ebuild
+++ b/sys-apps/aboot/aboot-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/aboot/aboot-0.9-r1.ebuild,v 1.7 2003/02/24 22:34:58 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/aboot/aboot-0.9-r1.ebuild,v 1.8 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Alpha Linux boot loader for srm"
@@ -9,7 +9,7 @@ HOMEPAGE="http://aboot.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha -x86 -ppc -sparc -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -mips"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/acct/acct-6.3.5.ebuild b/sys-apps/acct/acct-6.3.5.ebuild
index b60801b21495..ac020da5b03a 100644
--- a/sys-apps/acct/acct-6.3.5.ebuild
+++ b/sys-apps/acct/acct-6.3.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acct/acct-6.3.5.ebuild,v 1.2 2003/02/13 15:46:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acct/acct-6.3.5.ebuild,v 1.3 2003/06/21 21:19:38 drobbins Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU system accounting utilities"
 SRC_URI="http://ftp.debian.org/debian/pool/main/a/acct/${MY_P}.orig.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/acct.html"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/acl/acl-1.1.3.ebuild b/sys-apps/acl/acl-1.1.3.ebuild
index a57b9e8410d4..4a7f56dce2a7 100644
--- a/sys-apps/acl/acl-1.1.3.ebuild
+++ b/sys-apps/acl/acl-1.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-1.1.3.ebuild,v 1.7 2003/02/13 15:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-1.1.3.ebuild,v 1.8 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="XFS dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/latest/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1 GPL-2"
 
diff --git a/sys-apps/acl/acl-2.0.18.ebuild b/sys-apps/acl/acl-2.0.18.ebuild
index 9dbff68333b7..13ff4ddb14cb 100644
--- a/sys-apps/acl/acl-2.0.18.ebuild
+++ b/sys-apps/acl/acl-2.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.0.18.ebuild,v 1.7 2003/02/13 15:46:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.0.18.ebuild,v 1.8 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="XFS dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/acl/acl-2.0.5_p20020330.ebuild b/sys-apps/acl/acl-2.0.5_p20020330.ebuild
index c98445a9efdb..cac40433fea9 100644
--- a/sys-apps/acl/acl-2.0.5_p20020330.ebuild
+++ b/sys-apps/acl/acl-2.0.5_p20020330.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.0.5_p20020330.ebuild,v 1.2 2003/02/13 15:46:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.0.5_p20020330.ebuild,v 1.3 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/cmd/${PN}
 OPV=20020330
 DESCRIPTION="XFS dump/restore utilities"
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${OPV}.tar.bz2"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/acl/acl-2.1.1-r1.ebuild b/sys-apps/acl/acl-2.1.1-r1.ebuild
index 051c9fded602..36e1c13d37ea 100644
--- a/sys-apps/acl/acl-2.1.1-r1.ebuild
+++ b/sys-apps/acl/acl-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.1.1-r1.ebuild,v 1.4 2003/02/24 22:34:58 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.1.1-r1.ebuild,v 1.5 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="XFS dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="x86 ~mips"
+KEYWORDS="x86 amd64 ~mips"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/acl/acl-2.1.1.ebuild b/sys-apps/acl/acl-2.1.1.ebuild
index 6bc0c0056cc0..49568aacb6a8 100644
--- a/sys-apps/acl/acl-2.1.1.ebuild
+++ b/sys-apps/acl/acl-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.1.1.ebuild,v 1.2 2003/02/13 15:47:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.1.1.ebuild,v 1.3 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="XFS dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/acpid/acpid-1.0.1.ebuild b/sys-apps/acpid/acpid-1.0.1.ebuild
index adb92bf036bb..fffd6c287b45 100644
--- a/sys-apps/acpid/acpid-1.0.1.ebuild
+++ b/sys-apps/acpid/acpid-1.0.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.1.ebuild,v 1.10 2003/02/13 15:47:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.1.ebuild,v 1.11 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
 SRC_URI="ftp://download.sourceforge.net/pub/sourceforge/acpid/${P}.tar.gz"
 HOMEPAGE="http://acpid.sourceforge.net/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/acpid/acpid-1.0.2-r1.ebuild b/sys-apps/acpid/acpid-1.0.2-r1.ebuild
index d06a49b7d1c5..822615ffe865 100644
--- a/sys-apps/acpid/acpid-1.0.2-r1.ebuild
+++ b/sys-apps/acpid/acpid-1.0.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.2-r1.ebuild,v 1.2 2003/06/12 20:51:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.2-r1.ebuild,v 1.3 2003/06/21 21:19:38 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
 SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz"
 HOMEPAGE="http://acpid.sourceforge.net/"
 IUSE=""
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/anacron/anacron-2.3.ebuild b/sys-apps/anacron/anacron-2.3.ebuild
index e278d3693c6d..8aab6e2ed5b4 100644
--- a/sys-apps/anacron/anacron-2.3.ebuild
+++ b/sys-apps/anacron/anacron-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/anacron/anacron-2.3.ebuild,v 1.3 2003/02/15 08:15:34 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/anacron/anacron-2.3.ebuild,v 1.4 2003/06/21 21:19:38 drobbins Exp $
 
 #MY_P=${PN}-${PV}
 #S=${WORKDIR}/${MY_P}
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Anacron -- a periodic command scheduler"
 SRC_URI=" http://umn.dl.sourceforge.net/sourceforge/anacron/${P}.tar.gz"
 HOMEPAGE="http://anacron.sourceforge.net/"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 amd64 ppc"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.1.ebuild
index a3145b5c3c87..63d46821e8e1 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.1.ebuild,v 1.4 2003/02/13 15:47:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.1.ebuild,v 1.5 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="ftp://ftp.apcupsd.com/pub/apcupsd/development/${P}.tar.gz \
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
  
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild
index f99003c374a9..bed7c9069f3f 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild,v 1.1 2003/02/26 22:41:29 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild,v 1.2 2003/06/21 21:19:38 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~ppc arm"
+KEYWORDS="x86 amd64 ~ppc arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
index 5f5124071786..62c25c721c3f 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.1 2003/02/27 18:43:24 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.2 2003/06/21 21:19:38 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~ppc arm"
+KEYWORDS="x86 amd64 ~ppc arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
index 0ad7d3cd777a..dcf2f80bb3e6 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.1 2003/02/28 03:24:07 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.2 2003/06/21 21:19:38 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~ppc arm"
+KEYWORDS="x86 amd64 ~ppc arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5.ebuild
index 395626267104..e6da0be63b58 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5.ebuild,v 1.3 2003/02/24 23:43:09 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5.ebuild,v 1.4 2003/06/21 21:19:38 drobbins Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~ppc arm"
+KEYWORDS="x86 amd64 ~ppc arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.8.1.ebuild b/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
index cc357367b291..2bbfc2d30bca 100644
--- a/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.1.ebuild,v 1.15 2003/02/13 15:47:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.1.ebuild,v 1.16 2003/06/21 21:19:38 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="http://www.sibbald.com/apcupsd/download/oldversions/${P}.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 -ppc -sparc  -alpha"
+KEYWORDS="x86 amd64 -ppc -sparc  -alpha"
 SLOT="0"
 LICENSE="GPL-2"
  
diff --git a/sys-apps/apcupsd/apcupsd-3.8.5.ebuild b/sys-apps/apcupsd/apcupsd-3.8.5.ebuild
index 884461dabcdf..7984ffab6681 100644
--- a/sys-apps/apcupsd/apcupsd-3.8.5.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.8.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.5.ebuild,v 1.7 2003/02/13 15:47:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.5.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="http://www.sibbald.com/apcupsd/download/${P}.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 -ppc -sparc  -alpha"
+KEYWORDS="x86 amd64 -ppc -sparc  -alpha"
 SLOT="0"
 LICENSE="GPL-2"
  
diff --git a/sys-apps/apmd/apmd-3.0.2-r1.ebuild b/sys-apps/apmd/apmd-3.0.2-r1.ebuild
index 43261e97ef50..a84593ea0db6 100644
--- a/sys-apps/apmd/apmd-3.0.2-r1.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r1.ebuild,v 1.8 2003/02/13 15:47:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r1.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="X"
 
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
 S=${WORKDIR}/${PN}
diff --git a/sys-apps/apmd/apmd-3.0.2-r2.ebuild b/sys-apps/apmd/apmd-3.0.2-r2.ebuild
index e9e7a093644a..192f455c2582 100644
--- a/sys-apps/apmd/apmd-3.0.2-r2.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r2.ebuild,v 1.6 2003/02/13 15:47:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r2.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="X"
 
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
 S=${WORKDIR}/${PN}
diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
index c1cf1ecc7829..3dc3d6b363a8 100644
--- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.10 2003/02/13 15:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.11 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 
 
 DEPEND=">=sys-apps/debianutils-1.16
diff --git a/sys-apps/at/at-3.1.8-r3.ebuild b/sys-apps/at/at-3.1.8-r3.ebuild
index 4c6f255d1ca5..501a04243588 100644
--- a/sys-apps/at/at-3.1.8-r3.ebuild
+++ b/sys-apps/at/at-3.1.8-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r3.ebuild,v 1.12 2003/02/13 15:48:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r3.ebuild,v 1.13 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="queues jobs for later execution"
 SRC_URI="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.tar.bz2
 	 ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.dif"
 HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/at/at-3.1.8-r6.ebuild b/sys-apps/at/at-3.1.8-r6.ebuild
index c2f385e50f93..52ee5d1a1498 100644
--- a/sys-apps/at/at-3.1.8-r6.ebuild
+++ b/sys-apps/at/at-3.1.8-r6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r6.ebuild,v 1.9 2003/02/13 15:48:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r6.ebuild,v 1.10 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Queues jobs for later execution"
 SRC_URI="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.tar.bz2
 	 ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.dif"
 HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/at/at-3.1.8-r7.ebuild b/sys-apps/at/at-3.1.8-r7.ebuild
index db548b7d9bda..e0910b34897b 100644
--- a/sys-apps/at/at-3.1.8-r7.ebuild
+++ b/sys-apps/at/at-3.1.8-r7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r7.ebuild,v 1.7 2003/02/13 15:48:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r7.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Queues jobs for later execution"
 SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
 HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/at/at-3.1.8-r8.ebuild b/sys-apps/at/at-3.1.8-r8.ebuild
index 9bf7f6dba846..6e7bb0fa9b00 100644
--- a/sys-apps/at/at-3.1.8-r8.ebuild
+++ b/sys-apps/at/at-3.1.8-r8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r8.ebuild,v 1.11 2003/02/21 23:02:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r8.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Queues jobs for later execution"
 SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
 HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/atop/atop-1.9.ebuild b/sys-apps/atop/atop-1.9.ebuild
index a5092e0b1740..ff55819b366f 100644
--- a/sys-apps/atop/atop-1.9.ebuild
+++ b/sys-apps/atop/atop-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/atop/atop-1.9.ebuild,v 1.1 2003/02/18 22:13:19 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/atop/atop-1.9.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 
 DESCRIPTION="Resource-specific view of processes"
@@ -10,7 +10,7 @@ HOMEPAGE="http://freshmeat.net/releases/112061/"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="sys-apps/acct"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/attr/attr-2.1.1-r1.ebuild b/sys-apps/attr/attr-2.1.1-r1.ebuild
index 426032a4f125..b5d71c1f711b 100644
--- a/sys-apps/attr/attr-2.1.1-r1.ebuild
+++ b/sys-apps/attr/attr-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.1.1-r1.ebuild,v 1.4 2003/02/24 22:34:58 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.1.1-r1.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="xfs extended attributes tools"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="x86 ~mips"
+KEYWORDS="x86 amd64 ~mips"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/attr/attr-2.2.0.ebuild b/sys-apps/attr/attr-2.2.0.ebuild
index 9cc4f2d9f606..6e755c4baaa0 100644
--- a/sys-apps/attr/attr-2.2.0.ebuild
+++ b/sys-apps/attr/attr-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.2.0.ebuild,v 1.2 2003/04/13 15:24:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.2.0.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs extended attributes tools"
@@ -10,7 +10,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~mips"
+KEYWORDS="x86 amd64 ~mips"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4.0.5
diff --git a/sys-apps/attr/attr-2.4.1.ebuild b/sys-apps/attr/attr-2.4.1.ebuild
index bd4dc00796be..1bae745d0339 100644
--- a/sys-apps/attr/attr-2.4.1.ebuild
+++ b/sys-apps/attr/attr-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.1.ebuild,v 1.2 2003/04/13 15:18:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs extended attributes tools"
@@ -10,7 +10,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~mips"
+KEYWORDS="x86 amd64 ~mips"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4.0.5
diff --git a/sys-apps/autospeedstep/autospeedstep-0.2.ebuild b/sys-apps/autospeedstep/autospeedstep-0.2.ebuild
index 0513f379cd6c..0b9388f695d3 100644
--- a/sys-apps/autospeedstep/autospeedstep-0.2.ebuild
+++ b/sys-apps/autospeedstep/autospeedstep-0.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/autospeedstep/autospeedstep-0.2.ebuild,v 1.1 2003/06/17 23:38:28 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/autospeedstep/autospeedstep-0.2.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="A daemon which controls power consumption and processor speed depending on CPU load"
 HOMEPAGE="http://gpsdrive.kraftvoll.at/speedstep.shtml"
 SRC_URI="http://gpsdrive.kraftvoll.at/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-alpha -arm -hppa -mips -sparc ~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND=""
 
diff --git a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
index 90965e766b2a..227ef2e29e39 100644
--- a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.2 2003/05/20 20:49:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="bootstrap build"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.23"
diff --git a/sys-apps/baselayout/baselayout-1.8.6.7.ebuild b/sys-apps/baselayout/baselayout-1.8.6.7.ebuild
index 4749ace431f6..e23079a6f599 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.7.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v 1.2 2003/05/20 20:49:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~arm ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm ~hppa"
 
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.23"
diff --git a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
index dfd906d747e4..1c37cb2a8822 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.1 2003/05/21 09:01:18 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~arm ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm ~hppa"
 
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.23"
diff --git a/sys-apps/buffer/buffer-1.19-r1.ebuild b/sys-apps/buffer/buffer-1.19-r1.ebuild
index 28079ab064cc..d45d824b6f0a 100644
--- a/sys-apps/buffer/buffer-1.19-r1.ebuild
+++ b/sys-apps/buffer/buffer-1.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/buffer-1.19-r1.ebuild,v 1.2 2003/02/13 15:49:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/buffer-1.19-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="a tapedrive tool for speeding up reading from and writing to tape"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.microwerks.net/~hugo/download.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/buffer/buffer-1.19.ebuild b/sys-apps/buffer/buffer-1.19.ebuild
index 859fa532edde..d98788d305d7 100644
--- a/sys-apps/buffer/buffer-1.19.ebuild
+++ b/sys-apps/buffer/buffer-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/buffer-1.19.ebuild,v 1.3 2003/02/13 15:49:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/buffer-1.19.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="a tapedrive tool for speeding up rewinding of tape"
@@ -8,7 +8,7 @@ SRC_URI="http://www.microwerks.net/~hugo/download/${P}.tgz"
 HOMEPAGE="http://www.microwerks.net/~hugo/download.html"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND="sys-libs/glibc"
 
diff --git a/sys-apps/busybox/busybox-0.50.ebuild b/sys-apps/busybox/busybox-0.50.ebuild
index adfefdb5019a..9362ab35297d 100644
--- a/sys-apps/busybox/busybox-0.50.ebuild
+++ b/sys-apps/busybox/busybox-0.50.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.50.ebuild,v 1.14 2003/04/03 17:15:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.50.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
 SRC_URI="ftp://oss.lineo.com/busybox/${P}.tar.gz"
 HOMEPAGE="http://www.busybox.net"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/busybox/busybox-0.60.2.ebuild b/sys-apps/busybox/busybox-0.60.2.ebuild
index 82ec80b40d5c..dc5963e7fa9c 100644
--- a/sys-apps/busybox/busybox-0.60.2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.10 2003/04/03 17:15:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.11 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
 SRC_URI="ftp://oss.lineo.com/busybox/${P}.tar.gz"
 HOMEPAGE="http://www.busybox.net"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/busybox/busybox-0.60.3-r1.ebuild b/sys-apps/busybox/busybox-0.60.3-r1.ebuild
index f623e409725e..bf3b68fa482c 100644
--- a/sys-apps/busybox/busybox-0.60.3-r1.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.1 2003/04/03 17:28:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.busybox.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/busybox/busybox-0.60.3.ebuild b/sys-apps/busybox/busybox-0.60.3.ebuild
index 610cb5147225..f3e72e743a8d 100644
--- a/sys-apps/busybox/busybox-0.60.3.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.14 2003/04/03 17:15:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.busybox.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/busybox/busybox-0.60.5-r1.ebuild b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
index b161cf5a1494..97978e6ac98c 100644
--- a/sys-apps/busybox/busybox-0.60.5-r1.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.3 2003/02/13 15:50:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.busybox.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="static"
 
 DEPEND="virtual/glibc"
diff --git a/sys-apps/busybox/busybox-0.60.5.ebuild b/sys-apps/busybox/busybox-0.60.5.ebuild
index d0d267b30462..fc4ecb6b0104 100644
--- a/sys-apps/busybox/busybox-0.60.5.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5.ebuild,v 1.2 2003/02/13 15:50:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.busybox.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild b/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
index 911594dd9022..2c49f6997d46 100644
--- a/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
+++ b/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild,v 1.21 2003/03/02 01:36:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild,v 1.22 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 SRC_URI="ftp://sources.redhat.com/pub/bzip2/v102/${P}.tar.gz"
 HOMEPAGE="http://sources.redhat.com/bzip2/"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="BZIP2"
 
diff --git a/sys-apps/chpax/chpax-0.4.ebuild b/sys-apps/chpax/chpax-0.4.ebuild
index 5c8e6297d4bd..54e8d23d42c1 100644
--- a/sys-apps/chpax/chpax-0.4.ebuild
+++ b/sys-apps/chpax/chpax-0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.4.ebuild,v 1.2 2003/06/02 22:45:31 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.4.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/chpax
 
 DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries."
 SRC_URI="http://pageexec.virtualave.net/chpax-${PV}.tar.gz"
 HOMEPAGE="http://pageexec.virtualave.net"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="x86 amd64 ~sparc"
 LICENSE="public-domain"
 SLOT="0"
 
diff --git a/sys-apps/console-data/console-data-1999.08.29-r2.ebuild b/sys-apps/console-data/console-data-1999.08.29-r2.ebuild
index 5cfd6162af26..06ceed069e95 100644
--- a/sys-apps/console-data/console-data-1999.08.29-r2.ebuild
+++ b/sys-apps/console-data/console-data-1999.08.29-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-data/console-data-1999.08.29-r2.ebuild,v 1.13 2003/04/02 20:53:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-data/console-data-1999.08.29-r2.ebuild,v 1.14 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Data (fonts, keymaps) for the consoletools package"
 SRC_URI="mirror://sourceforge/lct/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://lct.sourceforge.net/data.html"
-KEYWORDS="x86 ppc sparc ~alpha mips"
+KEYWORDS="x86 amd64 ppc sparc ~alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild b/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild
index 2b6418e00470..b73aec48e582 100644
--- a/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild
+++ b/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild,v 1.14 2003/04/02 20:16:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Console and font utilities"
 SRC_URI="mirror://sourceforge/lct/${P}.tar.gz"
 HOMEPAGE="http://lct.sourceforge.net/"
-KEYWORDS="x86 mips"
+KEYWORDS="x86 amd64 mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild b/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild
index 158663028b74..981972341af0 100644
--- a/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild
+++ b/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild,v 1.17 2003/04/02 20:16:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild,v 1.18 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Console and font utilities"
 SRC_URI="mirror://sourceforge/lct/${P}.tar.gz"
 HOMEPAGE="http://lct.sourceforge.net/"
-KEYWORDS="x86 ppc sparc ~alpha mips"
+KEYWORDS="x86 amd64 ppc sparc ~alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/console-tools/console-tools-0.3.2.ebuild b/sys-apps/console-tools/console-tools-0.3.2.ebuild
index 42c8c3200d40..fe5d0b1f3cc0 100644
--- a/sys-apps/console-tools/console-tools-0.3.2.ebuild
+++ b/sys-apps/console-tools/console-tools-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.3.2.ebuild,v 1.4 2003/06/09 23:17:38 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.3.2.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 inherit libtool eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/lct/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips"
 
 DEPEND="sys-devel/autoconf
 	>=sys-apps/sed-4
diff --git a/sys-apps/coreutils/coreutils-4.5.11-r1.ebuild b/sys-apps/coreutils/coreutils-4.5.11-r1.ebuild
index 5d946d743400..b00e87067554 100644
--- a/sys-apps/coreutils/coreutils-4.5.11-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-4.5.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.11-r1.ebuild,v 1.1 2003/04/04 09:38:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.11-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa arm"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha ~hppa arm"
 
 DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )"
diff --git a/sys-apps/coreutils/coreutils-5.0.ebuild b/sys-apps/coreutils/coreutils-5.0.ebuild
index 2e8f621bcc1c..2a498c60207e 100644
--- a/sys-apps/coreutils/coreutils-5.0.ebuild
+++ b/sys-apps/coreutils/coreutils-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0.ebuild,v 1.1 2003/04/05 06:40:46 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/coreutils/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa arm"
+KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~hppa arm"
 
 DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )
diff --git a/sys-apps/cpio/cpio-2.4.2-r4.ebuild b/sys-apps/cpio/cpio-2.4.2-r4.ebuild
index 1bd3039d3910..d2ac4e5bca34 100644
--- a/sys-apps/cpio/cpio-2.4.2-r4.ebuild
+++ b/sys-apps/cpio/cpio-2.4.2-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.4.2-r4.ebuild,v 1.16 2003/02/15 20:09:08 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.4.2-r4.ebuild,v 1.17 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A file archival tool which can also read and write tar files"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/cpio/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
-KEYWORDS="x86 ppc sparc alpha hppa mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa mips"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 
diff --git a/sys-apps/cpio/cpio-2.5.ebuild b/sys-apps/cpio/cpio-2.5.ebuild
index 14b2b02252a2..98c53e8aeb9b 100644
--- a/sys-apps/cpio/cpio-2.5.ebuild
+++ b/sys-apps/cpio/cpio-2.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.5.ebuild,v 1.13 2003/03/28 02:15:56 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.5.ebuild,v 1.14 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="A file archival tool which can also read and write tar files"
 SRC_URI="mirror://gnu/cpio/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
 
-KEYWORDS="x86 ppc sparc ~alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc ~alpha hppa arm mips"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 
diff --git a/sys-apps/cramfs/cramfs-1.1.ebuild b/sys-apps/cramfs/cramfs-1.1.ebuild
index 29bae2b611ee..e9f1f07c4272 100644
--- a/sys-apps/cramfs/cramfs-1.1.ebuild
+++ b/sys-apps/cramfs/cramfs-1.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cramfs/cramfs-1.1.ebuild,v 1.4 2003/02/13 15:51:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cramfs/cramfs-1.1.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Linux filesystem designed to be simple, small, and to compress things well"
 HOMEPAGE="http://sf.net/projects/cramfs/"
 LICENSE="GPL-2"
 DEPEND="sys-libs/zlib
 	virtual/glibc"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 
 SLOT="0"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/sys-apps/cronbase/cronbase-0.2.1-r1.ebuild b/sys-apps/cronbase/cronbase-0.2.1-r1.ebuild
index 8c70be7921e1..e6a75117305b 100644
--- a/sys-apps/cronbase/cronbase-0.2.1-r1.ebuild
+++ b/sys-apps/cronbase/cronbase-0.2.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cronbase/cronbase-0.2.1-r1.ebuild,v 1.6 2003/02/13 15:51:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cronbase/cronbase-0.2.1-r1.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="The is the base for all cron ebuilds."
 HOMEPAGE="http://www.gentoo.org/"
 
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/cronbase/cronbase-0.2.1-r2.ebuild b/sys-apps/cronbase/cronbase-0.2.1-r2.ebuild
index 42ee4f47d691..2d01e6436797 100644
--- a/sys-apps/cronbase/cronbase-0.2.1-r2.ebuild
+++ b/sys-apps/cronbase/cronbase-0.2.1-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cronbase/cronbase-0.2.1-r2.ebuild,v 1.4 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cronbase/cronbase-0.2.1-r2.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="The is the base for all cron ebuilds."
 HOMEPAGE="http://www.gentoo.org/"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/cronbase/cronbase-0.2.1.ebuild b/sys-apps/cronbase/cronbase-0.2.1.ebuild
index 7d1f48114b0b..2e7ea6738716 100644
--- a/sys-apps/cronbase/cronbase-0.2.1.ebuild
+++ b/sys-apps/cronbase/cronbase-0.2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cronbase/cronbase-0.2.1.ebuild,v 1.11 2003/02/13 15:51:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cronbase/cronbase-0.2.1.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="The is the base for all cron ebuilds"
 HOMEPAGE="http://www.gentoo.org/"
 
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/daemontools/daemontools-0.76-r3.ebuild b/sys-apps/daemontools/daemontools-0.76-r3.ebuild
index 641f997abfa9..7aa21dba08b7 100644
--- a/sys-apps/daemontools/daemontools-0.76-r3.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r3.ebuild,v 1.3 2003/03/16 23:12:40 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r3.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/daemontools.html"
 
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="freedist"
 
diff --git a/sys-apps/dcron/dcron-2.7-r10.ebuild b/sys-apps/dcron/dcron-2.7-r10.ebuild
index 3b37e28ad197..3f5b044f6d95 100644
--- a/sys-apps/dcron/dcron-2.7-r10.ebuild
+++ b/sys-apps/dcron/dcron-2.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r10.ebuild,v 1.3 2003/04/18 20:28:56 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r10.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 # to use this, you must be part of the "cron" group
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/dcron
 DESCRIPTION="A cute little cron from Matt Dillon"
 SRC_URI="http://apollo.backplane.com/FreeSrc/dcron27.tgz"
 HOMEPAGE="http://apollo.backplane.com/"
-KEYWORDS="x86 ppc sparc hppa mips"
+KEYWORDS="x86 amd64 ppc sparc hppa mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/dcron/dcron-2.9.ebuild b/sys-apps/dcron/dcron-2.9.ebuild
index a92b71abfb45..7113d6c6b7b0 100644
--- a/sys-apps/dcron/dcron-2.9.ebuild
+++ b/sys-apps/dcron/dcron-2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9.ebuild,v 1.3 2003/05/20 19:41:48 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 # to use this, you must be part of the "cron" group
 
@@ -9,7 +9,7 @@ S=${WORKDIR}/${PN}
 DESCRIPTION="A cute little cron from Matt Dillon"
 SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
 HOMEPAGE="http://apollo.backplane.com/"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa alpha"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~hppa alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/dd_rescue/dd_rescue-1.02.ebuild b/sys-apps/dd_rescue/dd_rescue-1.02.ebuild
index 4573e3e423a9..e373242e0cfa 100644
--- a/sys-apps/dd_rescue/dd_rescue-1.02.ebuild
+++ b/sys-apps/dd_rescue/dd_rescue-1.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dd_rescue/dd_rescue-1.02.ebuild,v 1.2 2003/05/30 03:03:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dd_rescue/dd_rescue-1.02.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="similar to dd but can copy from source with errors"
 HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 amd64 ~sparc"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild
index aca6cbd19f89..e127f68d2341 100644
--- a/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild,v 1.3 2003/04/12 14:48:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="static build"
 
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 BSD"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r2.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r2.ebuild
index 1bb88151d40e..d0e799f3cbc7 100644
--- a/sys-apps/debianutils/debianutils-1.16.7-r2.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r2.ebuild,v 1.1 2003/05/18 23:11:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r2.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="static build"
 
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/deltup/deltup-0.3.4.ebuild b/sys-apps/deltup/deltup-0.3.4.ebuild
index 9f71eea85983..2a304b71180b 100644
--- a/sys-apps/deltup/deltup-0.3.4.ebuild
+++ b/sys-apps/deltup/deltup-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/deltup/deltup-0.3.4.ebuild,v 1.1 2003/06/08 08:44:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/deltup/deltup-0.3.4.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Patch system for Gentoo sources.  Retains MD5 codes"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/deltup/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND=">=dev-util/xdelta-1.1.3
 	>=sys-apps/bzip2-1.0.0"
diff --git a/sys-apps/deltup/deltup-0.3.5.ebuild b/sys-apps/deltup/deltup-0.3.5.ebuild
index cd0c9177cf06..b2f891809e78 100644
--- a/sys-apps/deltup/deltup-0.3.5.ebuild
+++ b/sys-apps/deltup/deltup-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/deltup/deltup-0.3.5.ebuild,v 1.1 2003/06/14 06:42:50 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/deltup/deltup-0.3.5.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Patch system for Gentoo sources.  Retains MD5 codes"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/deltup/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND=">=dev-util/xdelta-1.1.3
 	>=sys-apps/bzip2-1.0.0"
diff --git a/sys-apps/deltup/deltup-0.3.6.1.ebuild b/sys-apps/deltup/deltup-0.3.6.1.ebuild
index 375c136b5e09..abc00db38e50 100644
--- a/sys-apps/deltup/deltup-0.3.6.1.ebuild
+++ b/sys-apps/deltup/deltup-0.3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/deltup/deltup-0.3.6.1.ebuild,v 1.1 2003/06/17 07:14:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/deltup/deltup-0.3.6.1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Patch system for Gentoo sources.  Retains MD5 codes"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/deltup/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND=">=dev-util/xdelta-1.1.3
 	>=sys-apps/bzip2-1.0.0"
diff --git a/sys-apps/devfsd/devfsd-1.3.24.ebuild b/sys-apps/devfsd/devfsd-1.3.24.ebuild
index 8c4c4decbd7c..f52d2b29b664 100644
--- a/sys-apps/devfsd/devfsd-1.3.24.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.24.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.24.ebuild,v 1.8 2003/02/13 15:52:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.24.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Daemon for the Linux Device Filesystem"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/devfsd/devfsd-1.3.25-r1.ebuild b/sys-apps/devfsd/devfsd-1.3.25-r1.ebuild
index f02fdfa15ad1..fcdb0dcd8104 100644
--- a/sys-apps/devfsd/devfsd-1.3.25-r1.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25-r1.ebuild,v 1.1 2003/03/02 22:29:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Daemon for the Linux Device Filesystem"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/devfsd/devfsd-1.3.25-r2.ebuild b/sys-apps/devfsd/devfsd-1.3.25-r2.ebuild
index a69ef3d2997c..d5f1cbf32c8a 100644
--- a/sys-apps/devfsd/devfsd-1.3.25-r2.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25-r2.ebuild,v 1.2 2003/03/13 09:50:04 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25-r2.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Daemon for the Linux Device Filesystem"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/devfsd/devfsd-1.3.25-r3.ebuild b/sys-apps/devfsd/devfsd-1.3.25-r3.ebuild
index 2fc3d8462290..994fee5942de 100644
--- a/sys-apps/devfsd/devfsd-1.3.25-r3.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25-r3.ebuild,v 1.4 2003/06/13 10:28:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25-r3.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Daemon for the Linux Device Filesystem"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
 
-KEYWORDS="x86 ~ppc sparc ~alpha ~mips hppa arm"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha ~mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/devfsd/devfsd-1.3.25.ebuild b/sys-apps/devfsd/devfsd-1.3.25.ebuild
index d48f61b10851..e5c6e0863701 100644
--- a/sys-apps/devfsd/devfsd-1.3.25.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.25.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25.ebuild,v 1.15 2003/02/13 15:52:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25.ebuild,v 1.16 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Daemon for the Linux Device Filesystem"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/di/di-3.8.ebuild b/sys-apps/di/di-3.8.ebuild
index 6d3ed335ac93..f982d24f7d2c 100644
--- a/sys-apps/di/di-3.8.ebuild
+++ b/sys-apps/di/di-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/di/di-3.8.ebuild,v 1.3 2003/05/25 22:56:17 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/di/di-3.8.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 # This ebuild was generated by Ebuilder v0.4.
 
@@ -8,7 +8,7 @@ S="${WORKDIR}/${P}"
 DESCRIPTION="Disk Information Utility"
 SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.com/di/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 DEPEND=""
 SLOT="0"
diff --git a/sys-apps/di/di-3.9.ebuild b/sys-apps/di/di-3.9.ebuild
index 37704415df9d..ef752771df9e 100644
--- a/sys-apps/di/di-3.9.ebuild
+++ b/sys-apps/di/di-3.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/di/di-3.9.ebuild,v 1.1 2003/05/25 22:56:17 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/di/di-3.9.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Disk Information Utility"
 SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.com/di/"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 DEPEND=""
 SLOT="0"
diff --git a/sys-apps/diffutils/diffutils-2.7.7.ebuild b/sys-apps/diffutils/diffutils-2.7.7.ebuild
index 512a0f958022..9d9bccc02a02 100644
--- a/sys-apps/diffutils/diffutils-2.7.7.ebuild
+++ b/sys-apps/diffutils/diffutils-2.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.7.7.ebuild,v 1.13 2003/02/28 03:26:39 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.7.7.ebuild,v 1.14 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
 SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-KEYWORDS="x86 ppc sparc alpha arm"
+KEYWORDS="x86 amd64 ppc sparc alpha arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
index ae2ad2e1c036..02627ed43336 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild,v 1.9 2003/04/02 08:37:03 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild,v 1.10 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Tools to make diffs and compare files"
 SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild
index 616bd5f3c465..7a4684bd67d9 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild,v 1.4 2003/02/28 03:26:39 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Tools to make diffs and compare files"
 SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
index 576b3631d6b4..1f3e30dcddba 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild,v 1.10 2003/06/13 11:02:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild,v 1.11 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build static"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Tools to make diffs and compare files"
 SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
 
-KEYWORDS="x86 ppc sparc ~alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc ~alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/discover-data/discover-data-1.2002.05.23-r1.ebuild b/sys-apps/discover-data/discover-data-1.2002.05.23-r1.ebuild
index 03c0b23d5857..215025d4167f 100644
--- a/sys-apps/discover-data/discover-data-1.2002.05.23-r1.ebuild
+++ b/sys-apps/discover-data/discover-data-1.2002.05.23-r1.ebuild
@@ -1,14 +1,14 @@
 # (C) 2002 The TelemetryBox Corporation. http://telemetrybox.biz
 # Distributed under the terms of the GNU General Public License v2
 # Christoph Lameter, <christoph@lameter.com>, July 15, 2002
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-1.2002.05.23-r1.ebuild,v 1.4 2002/10/19 01:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-1.2002.05.23-r1.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="data for discover. list of pci ids. pnp ids etc."
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/d/discover-data/${PN}_${PV}-1.tar.gz"
 HOMEPAGE="http://hackers.progeny.com/discover/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 DEPEND="sys-apps/tar sys-apps/gzip"
 RDEPEND=""
 
diff --git a/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild b/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild
index 277c980354b1..c71a93e99c29 100644
--- a/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild
+++ b/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild
@@ -1,14 +1,14 @@
 # (C) 2002 The TelemetryBox Corporation. http://telemetrybox.biz
 # Distributed under the terms of the GNU General Public License v2
 # Christoph Lameter, <christoph@lameter.com>, July 15, 2002
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild,v 1.6 2003/03/11 20:50:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="data for discover. list of pci ids. pnp ids etc."
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/d/discover-data/discover-data_1.2002.05.23-1.tar.gz"
 HOMEPAGE="http://hackers.progeny.com/discover/"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 DEPEND="sys-apps/tar sys-apps/gzip"
 RDEPEND="app-shells/bash"
diff --git a/sys-apps/discover/discover-1.5-r1.ebuild b/sys-apps/discover/discover-1.5-r1.ebuild
index aed12e700b34..c702a77c2ab5 100644
--- a/sys-apps/discover/discover-1.5-r1.ebuild
+++ b/sys-apps/discover/discover-1.5-r1.ebuild
@@ -1,14 +1,14 @@
 # (C) 2002 The TelemetryBox Corporation. http://telemetrybox.biz
 # Distributed under the terms of the GNU General Public License v2
 # Christoph Lameter, <christoph@lameter.com>, July 15, 2002
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/discover-1.5-r1.ebuild,v 1.5 2002/10/19 01:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/discover-1.5-r1.ebuild,v 1.6 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Discover hardware and load the appropriate drivers for that hardware."
 HOMEPAGE="http://hackers.progeny.com/discover/"
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/d/discover/${PN}_${PV}-1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 DEPEND="sys-apps/tar sys-apps/gzip"
 RDEPEND="sys-apps/discover-data"
 
diff --git a/sys-apps/dmapi/dmapi-0.2.2-r1.ebuild b/sys-apps/dmapi/dmapi-0.2.2-r1.ebuild
index 36ed8e616f7b..6f1aa5d40e7b 100644
--- a/sys-apps/dmapi/dmapi-0.2.2-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-0.2.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-0.2.2-r1.ebuild,v 1.6 2003/02/13 15:52:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-0.2.2-r1.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="XFS data management API library"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/latest/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1 GPL-2"
 
diff --git a/sys-apps/dmapi/dmapi-0.2.2.ebuild b/sys-apps/dmapi/dmapi-0.2.2.ebuild
index cdfb0b069476..77e475996b4c 100644
--- a/sys-apps/dmapi/dmapi-0.2.2.ebuild
+++ b/sys-apps/dmapi/dmapi-0.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-0.2.2.ebuild,v 1.7 2003/02/13 15:52:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-0.2.2.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs data management API library"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/latest/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1 GPL-2"
 
diff --git a/sys-apps/dmapi/dmapi-2.0.1_p20020330.ebuild b/sys-apps/dmapi/dmapi-2.0.1_p20020330.ebuild
index 398e8c9b8853..a40bdcd6fbfb 100644
--- a/sys-apps/dmapi/dmapi-2.0.1_p20020330.ebuild
+++ b/sys-apps/dmapi/dmapi-2.0.1_p20020330.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.1_p20020330.ebuild,v 1.2 2003/02/13 15:52:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.1_p20020330.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/cmd/${PN}
 OPV=20020330
 DESCRIPTION="XFS data management API library"
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${OPV}.tar.bz2"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/dmapi/dmapi-2.0.5-r1.ebuild b/sys-apps/dmapi/dmapi-2.0.5-r1.ebuild
index 0a7a9d6c4829..8631dfecf29e 100644
--- a/sys-apps/dmapi/dmapi-2.0.5-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.5-r1.ebuild,v 1.5 2003/04/16 07:27:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.5-r1.ebuild,v 1.6 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="XFS data management API library"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="x86 ~mips"
+KEYWORDS="x86 amd64 ~mips"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/dmapi/dmapi-2.0.5.ebuild b/sys-apps/dmapi/dmapi-2.0.5.ebuild
index 6dfabf22f2b4..961ce4f6778e 100644
--- a/sys-apps/dmapi/dmapi-2.0.5.ebuild
+++ b/sys-apps/dmapi/dmapi-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.5.ebuild,v 1.8 2003/02/13 15:53:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.5.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="XFS data management API library"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/dnotify/dnotify-0.5.0.ebuild b/sys-apps/dnotify/dnotify-0.5.0.ebuild
index db31a346d7be..38937229723d 100644
--- a/sys-apps/dnotify/dnotify-0.5.0.ebuild
+++ b/sys-apps/dnotify/dnotify-0.5.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.5.0.ebuild,v 1.10 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.5.0.ebuild,v 1.11 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Execute a command when the contents of a directory change"
 SRC_URI="http://www.student.lu.se/~nbi98oli/src/dnotify-0.5.0.tar.gz"
 HOMEPAGE="http://www.student.lu.se/~nbi98oli/"
-KEYWORDS="x86 ppc sparc mips"
+KEYWORDS="x86 amd64 ppc sparc mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/dog/dog-1.7.ebuild b/sys-apps/dog/dog-1.7.ebuild
index 646afa5f1423..71cd5b8abede 100644
--- a/sys-apps/dog/dog-1.7.ebuild
+++ b/sys-apps/dog/dog-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7.ebuild,v 1.3 2003/06/07 07:54:00 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Dog is better than cat"
 SRC_URI="http://jl.photodex.com/dog/${P}.tar.gz"
@@ -11,7 +11,7 @@ inherit ccc
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 amd64 ~alpha"
 DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild
index 89456b47f681..c06863006861 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild,v 1.6 2003/03/15 11:23:13 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild
index 3c2db6b61522..dc82164450d9 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild,v 1.2 2003/06/01 04:24:56 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/ed/ed-0.2-r3.ebuild b/sys-apps/ed/ed-0.2-r3.ebuild
index 4e480613119b..74d4e9265140 100644
--- a/sys-apps/ed/ed-0.2-r3.ebuild
+++ b/sys-apps/ed/ed-0.2-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r3.ebuild,v 1.19 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r3.ebuild,v 1.20 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Your basic line editor"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/ed/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/ed/"
-KEYWORDS="x86 ppc sparc alpha hppa mips arm"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa mips arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/efsd/efsd-0.0.1.20030220-r1.ebuild b/sys-apps/efsd/efsd-0.0.1.20030220-r1.ebuild
index 13d52c67ee62..33d8cae4a288 100644
--- a/sys-apps/efsd/efsd-0.0.1.20030220-r1.ebuild
+++ b/sys-apps/efsd/efsd-0.0.1.20030220-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/efsd/efsd-0.0.1.20030220-r1.ebuild,v 1.1 2003/03/20 13:24:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/efsd/efsd-0.0.1.20030220-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND="dev-lang/perl"
 
diff --git a/sys-apps/efsd/efsd-0.0.1.20030220.ebuild b/sys-apps/efsd/efsd-0.0.1.20030220.ebuild
index 4b5babd03754..bbe9039a8b10 100644
--- a/sys-apps/efsd/efsd-0.0.1.20030220.ebuild
+++ b/sys-apps/efsd/efsd-0.0.1.20030220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/efsd/efsd-0.0.1.20030220.ebuild,v 1.7 2003/03/20 13:24:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/efsd/efsd-0.0.1.20030220.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND="dev-lang/perl"
 
diff --git a/sys-apps/eject/eject-2.0.10.ebuild b/sys-apps/eject/eject-2.0.10.ebuild
index b97364c760b7..8f71a2fe7abb 100644
--- a/sys-apps/eject/eject-2.0.10.ebuild
+++ b/sys-apps/eject/eject-2.0.10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.10.ebuild,v 1.14 2003/02/13 15:54:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.10.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz"
 HOMEPAGE="http://www.pobox.com/~tranter/eject.html"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/eject/eject-2.0.12-r1.ebuild b/sys-apps/eject/eject-2.0.12-r1.ebuild
index 099ed1ed91b1..5999be08fc2b 100644
--- a/sys-apps/eject/eject-2.0.12-r1.ebuild
+++ b/sys-apps/eject/eject-2.0.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.12-r1.ebuild,v 1.2 2003/03/06 20:57:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.12-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
 	http://www.pobox.com/~tranter/${P}.tar.gz"
 HOMEPAGE="http://eject.sourceforge.net/"
 
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/eject/eject-2.0.12.ebuild b/sys-apps/eject/eject-2.0.12.ebuild
index 941440a74aa6..7776b6a79f8e 100644
--- a/sys-apps/eject/eject-2.0.12.ebuild
+++ b/sys-apps/eject/eject-2.0.12.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.12.ebuild,v 1.6 2003/02/22 04:49:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.12.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz"
 HOMEPAGE="http://eject.sourceforge.net/"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
+KEYWORDS="x86 amd64 ~ppc ~sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/eject/eject-2.0.6.ebuild b/sys-apps/eject/eject-2.0.6.ebuild
index 041412fa1020..45234ae5ac8d 100644
--- a/sys-apps/eject/eject-2.0.6.ebuild
+++ b/sys-apps/eject/eject-2.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.6.ebuild,v 1.12 2003/02/13 15:54:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.6.ebuild,v 1.13 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
 	 http://www2.cddc.vt.edu/linux/utils/disk-management/${P}.tar.gz"
 HOMEPAGE="http://www.pobox.com/~tranter/eject.html"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 amd64 ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/epm/epm-0.7.ebuild b/sys-apps/epm/epm-0.7.ebuild
index 509c2d0e433a..326ebfbab29b 100644
--- a/sys-apps/epm/epm-0.7.ebuild
+++ b/sys-apps/epm/epm-0.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.7.ebuild,v 1.10 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.7.ebuild,v 1.11 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rpm workalike for Gentoo Linux"
 SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 RDEPEND=">=dev-lang/perl-5"
diff --git a/sys-apps/epm/epm-0.8.1.ebuild b/sys-apps/epm/epm-0.8.1.ebuild
index 39f5a5a7149f..137f3622546c 100644
--- a/sys-apps/epm/epm-0.8.1.ebuild
+++ b/sys-apps/epm/epm-0.8.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.1.ebuild,v 1.1 2003/04/24 02:27:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rpm workalike for Gentoo Linux"
 SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 RDEPEND=">=dev-lang/perl-5"
diff --git a/sys-apps/epm/epm-0.8.2.ebuild b/sys-apps/epm/epm-0.8.2.ebuild
index cc39f312e48b..c93ec2d614b9 100644
--- a/sys-apps/epm/epm-0.8.2.ebuild
+++ b/sys-apps/epm/epm-0.8.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.2.ebuild,v 1.1 2003/05/01 02:52:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.2.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rpm workalike for Gentoo Linux"
 SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=dev-lang/perl-5"
diff --git a/sys-apps/epm/epm-0.8.3.ebuild b/sys-apps/epm/epm-0.8.3.ebuild
index c48c19f5c686..efbed69484d2 100644
--- a/sys-apps/epm/epm-0.8.3.ebuild
+++ b/sys-apps/epm/epm-0.8.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.3.ebuild,v 1.1 2003/05/02 02:03:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.3.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rpm workalike for Gentoo Linux"
 SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=dev-lang/perl-5"
diff --git a/sys-apps/epm/epm-0.8.4.ebuild b/sys-apps/epm/epm-0.8.4.ebuild
index e3e22f1ed261..0be3ecd191e1 100644
--- a/sys-apps/epm/epm-0.8.4.ebuild
+++ b/sys-apps/epm/epm-0.8.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.4.ebuild,v 1.1 2003/05/27 01:39:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.4.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="rpm workalike for Gentoo Linux"
 SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=dev-lang/perl-5"
diff --git a/sys-apps/epm/epm-0.8.ebuild b/sys-apps/epm/epm-0.8.ebuild
index 96ccc12be708..dba23423462b 100644
--- a/sys-apps/epm/epm-0.8.ebuild
+++ b/sys-apps/epm/epm-0.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.ebuild,v 1.6 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.8.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rpm workalike for Gentoo Linux"
 SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
 HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 RDEPEND=">=dev-lang/perl-5"
diff --git a/sys-apps/ethtool/ethtool-1.7.ebuild b/sys-apps/ethtool/ethtool-1.7.ebuild
index 743e9306a91a..a804281c3ac6 100644
--- a/sys-apps/ethtool/ethtool-1.7.ebuild
+++ b/sys-apps/ethtool/ethtool-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-1.7.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-1.7.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Utility for examining and tuning your ethernet-based network interface"
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="x86 alpha sparc  ppc"
+KEYWORDS="x86 amd64 alpha sparc  ppc"
 
 IUSE=""
 
diff --git a/sys-apps/evms/evms-1.2.0-r1.ebuild b/sys-apps/evms/evms-1.2.0-r1.ebuild
index 2d4035c27b70..70d604b088c9 100644
--- a/sys-apps/evms/evms-1.2.0-r1.ebuild
+++ b/sys-apps/evms/evms-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.0-r1.ebuild,v 1.2 2003/02/13 15:55:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.0-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="ncurses gtk"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
 
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/evms/evms-1.2.0.ebuild b/sys-apps/evms/evms-1.2.0.ebuild
index 29e866ee9015..14a12aa66327 100644
--- a/sys-apps/evms/evms-1.2.0.ebuild
+++ b/sys-apps/evms/evms-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.0.ebuild,v 1.6 2003/02/13 15:55:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.0.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="ncurses gtk"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 #EVMS uses libuuid from e2fsprogs
 DEPEND="virtual/glibc gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses ) sys-apps/e2fsprogs"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/evms/evms-1.2.1-r1.ebuild b/sys-apps/evms/evms-1.2.1-r1.ebuild
index a925a36701ab..ec8cd44d5d62 100644
--- a/sys-apps/evms/evms-1.2.1-r1.ebuild
+++ b/sys-apps/evms/evms-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.1-r1.ebuild,v 1.4 2003/04/03 20:52:40 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.1-r1.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="ncurses gtk"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
 
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/evms/evms-1.2.1.ebuild b/sys-apps/evms/evms-1.2.1.ebuild
index b9f339f942d7..e1e30387569c 100644
--- a/sys-apps/evms/evms-1.2.1.ebuild
+++ b/sys-apps/evms/evms-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.1.ebuild,v 1.2 2003/02/13 15:55:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.2.1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="ncurses gtk"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
 
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/evms/evms-2.0.0-r1.ebuild b/sys-apps/evms/evms-2.0.0-r1.ebuild
index fe07b637f787..9564ec93125a 100644
--- a/sys-apps/evms/evms-2.0.0-r1.ebuild
+++ b/sys-apps/evms/evms-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-2.0.0-r1.ebuild,v 1.2 2003/04/07 08:13:48 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-2.0.0-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="ncurses gtk"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/evms/evms-2.0.1.ebuild b/sys-apps/evms/evms-2.0.1.ebuild
index 931c3174be5f..4fc943c1e321 100644
--- a/sys-apps/evms/evms-2.0.1.ebuild
+++ b/sys-apps/evms/evms-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-2.0.1.ebuild,v 1.1 2003/05/10 04:07:01 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-2.0.1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="ncurses gtk"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/ext2resize/ext2resize-1.1.17-r1.ebuild b/sys-apps/ext2resize/ext2resize-1.1.17-r1.ebuild
index 0e1f12fa7284..d633686aa795 100644
--- a/sys-apps/ext2resize/ext2resize-1.1.17-r1.ebuild
+++ b/sys-apps/ext2resize/ext2resize-1.1.17-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ext2resize/ext2resize-1.1.17-r1.ebuild,v 1.1 2003/04/25 00:36:26 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ext2resize/ext2resize-1.1.17-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="static"
 
 DESCRIPTION="EXT2 and EXT3 filesystem resizing utilities"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://ext2resize.sourceforge.net/"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/ext2resize/ext2resize-1.1.17.ebuild b/sys-apps/ext2resize/ext2resize-1.1.17.ebuild
index 7662bd87b4d2..90e1f57006a5 100644
--- a/sys-apps/ext2resize/ext2resize-1.1.17.ebuild
+++ b/sys-apps/ext2resize/ext2resize-1.1.17.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ext2resize/ext2resize-1.1.17.ebuild,v 1.11 2003/02/13 15:55:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ext2resize/ext2resize-1.1.17.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="EXT2 and EXT3 filesystem resizing utilities"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://ext2resize.sourceforge.net/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/ezusb2131/ezusb2131-1.0.ebuild b/sys-apps/ezusb2131/ezusb2131-1.0.ebuild
index 7d4781685884..36ba1e09e5e9 100644
--- a/sys-apps/ezusb2131/ezusb2131-1.0.ebuild
+++ b/sys-apps/ezusb2131/ezusb2131-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ezusb2131/ezusb2131-1.0.ebuild,v 1.1 2003/05/22 11:15:09 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ezusb2131/ezusb2131-1.0.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 MY_P=${PN/e/E}-${PV}
 DESCRIPTION="This is a firmware uploader for EZ-USB devices"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ezusb2131/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND=""
 
diff --git a/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild b/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
index 8c300c5bcce2..89c2f37dd6e2 100644
--- a/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild,v 1.4 2003/02/13 15:55:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 MY_P="${PN}_${PV}-4.1"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://joostje.op.het.net/fakeroot/index.html"
 SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="x86 amd64 ~sparc ~ppc"
 
 RDEPEND=">=virtual/glibc-2.2.2"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/fakeroot/fakeroot-0.4.4.ebuild b/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
index f28e26865c2b..2a774200d69b 100644
--- a/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
+++ b/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4.ebuild,v 1.2 2003/02/13 15:55:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 MY_P="${PN}_${PV}-4.1"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://joostje.op.het.net/fakeroot/index.html"
 SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 RDEPEND=">=virtual/glibc-2.2.2"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index effb42b3c8de..2fa5bf5fc247 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.17 2003/02/13 15:56:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.18 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A utility to set the framebuffer videomode"
 SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${P}.tar.gz"
 HOMEPAGE="http://linux-fbdev.org"
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/fcron/fcron-2.0.0-r1.ebuild b/sys-apps/fcron/fcron-2.0.0-r1.ebuild
index 64102205292b..3f146f11c825 100644
--- a/sys-apps/fcron/fcron-2.0.0-r1.ebuild
+++ b/sys-apps/fcron/fcron-2.0.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r1.ebuild,v 1.14 2003/02/13 15:56:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r1.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 amd64 -ppc sparc "
 
 S=${WORKDIR}/${P}
 SRC_URI="http://fcron.free.fr/${P}.src.tar.gz"
diff --git a/sys-apps/fcron/fcron-2.0.0-r2.ebuild b/sys-apps/fcron/fcron-2.0.0-r2.ebuild
index 92a660680820..0ed608f4e6f1 100644
--- a/sys-apps/fcron/fcron-2.0.0-r2.ebuild
+++ b/sys-apps/fcron/fcron-2.0.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r2.ebuild,v 1.3 2003/02/13 15:56:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r2.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 amd64 -ppc sparc "
 
 S=${WORKDIR}/${P}
 SRC_URI="http://fcron.free.fr/${P}.src.tar.gz"
diff --git a/sys-apps/fcron/fcron-2.0.0-r3.ebuild b/sys-apps/fcron/fcron-2.0.0-r3.ebuild
index b22435d1a4be..a8af98702d2f 100644
--- a/sys-apps/fcron/fcron-2.0.0-r3.ebuild
+++ b/sys-apps/fcron/fcron-2.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r3.ebuild,v 1.3 2003/05/15 03:22:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r3.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://fcron.free.fr/${P}.src.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc ~sparc hppa ~mips"
+KEYWORDS="x86 amd64 -ppc ~sparc hppa ~mips"
 
 DEPEND="virtual/editor"
 RDEPEND="!virtual/cron sys-apps/cronbase virtual/mta"
diff --git a/sys-apps/file/file-3.37.ebuild b/sys-apps/file/file-3.37.ebuild
index f0fa1eae78c9..ab7d8db6db91 100644
--- a/sys-apps/file/file-3.37.ebuild
+++ b/sys-apps/file/file-3.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.37.ebuild,v 1.16 2003/02/13 15:56:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.37.ebuild,v 1.17 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 LICENSE="as-is"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/file/file-3.39.ebuild b/sys-apps/file/file-3.39.ebuild
index 19cb0452f486..2ec2cc940e9d 100644
--- a/sys-apps/file/file-3.39.ebuild
+++ b/sys-apps/file/file-3.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.39.ebuild,v 1.10 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.39.ebuild,v 1.11 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/file/file-3.41.ebuild b/sys-apps/file/file-3.41.ebuild
index 80be28abf21c..1429d7032c91 100644
--- a/sys-apps/file/file-3.41.ebuild
+++ b/sys-apps/file/file-3.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.41.ebuild,v 1.2 2003/03/08 19:21:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.41.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/file/file-4.01.ebuild b/sys-apps/file/file-4.01.ebuild
index bdfce38d0861..97c07bebcced 100644
--- a/sys-apps/file/file-4.01.ebuild
+++ b/sys-apps/file/file-4.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.01.ebuild,v 1.5 2003/06/01 07:42:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.01.ebuild,v 1.6 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="x86 ppc sparc ~arm ~alpha"
+KEYWORDS="x86 amd64 ppc sparc ~arm ~alpha"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/file/file-4.02.ebuild b/sys-apps/file/file-4.02.ebuild
index 524d27836e0b..cb209c3ea45e 100644
--- a/sys-apps/file/file-4.02.ebuild
+++ b/sys-apps/file/file-4.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.02.ebuild,v 1.3 2003/06/01 07:42:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.02.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="x86 ppc sparc ~arm ~alpha"
+KEYWORDS="x86 amd64 ppc sparc ~arm ~alpha"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild b/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild
index 14bf919dae1a..da451e8614ee 100644
--- a/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild,v 1.3 2003/02/13 15:56:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="acl nls build"
 ACLPV=4.1.11acl-0.8.25
@@ -10,7 +10,7 @@ DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz http://cvs.gentoo.org/~styx/fileutils-${ACLPV}.diff.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
 
-KEYWORDS="-x86"
+KEYWORDS="x86 "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/fileutils/fileutils-4.1.11.ebuild b/sys-apps/fileutils/fileutils-4.1.11.ebuild
index 2b15a3022a86..8317e31afb8a 100644
--- a/sys-apps/fileutils/fileutils-4.1.11.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11.ebuild,v 1.9 2003/03/15 18:15:21 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11.ebuild,v 1.10 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
 
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86  ppc sparc alpha hppa arm mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild b/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
index a6e2e138969a..402ee4ebcd93 100644
--- a/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild,v 1.11 2003/02/13 15:56:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build acl"
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz http://acl.bestbits.at/current/diff/fileutils-${ACLPV}.xdelta"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86  ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/fileutils/fileutils-4.1.8.ebuild b/sys-apps/fileutils/fileutils-4.1.8.ebuild
index 0da95d5785ab..5293671246d1 100644
--- a/sys-apps/fileutils/fileutils-4.1.8.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8.ebuild,v 1.7 2003/02/13 15:56:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-KEYWORDS="x86"
+KEYWORDS="x86 "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/findutils/findutils-4.1.7-r1.ebuild b/sys-apps/findutils/findutils-4.1.7-r1.ebuild
index 632d5c467cde..ca7c58b8ffd7 100644
--- a/sys-apps/findutils/findutils-4.1.7-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r1.ebuild,v 1.14 2003/02/13 15:56:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r1.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="GNU utilities to find files"
 SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/findutils/findutils-4.1.7-r2.ebuild b/sys-apps/findutils/findutils-4.1.7-r2.ebuild
index 7f8eb13bef29..2a4d7090642a 100644
--- a/sys-apps/findutils/findutils-4.1.7-r2.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r2.ebuild,v 1.6 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r2.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build afs"
 
@@ -10,7 +10,7 @@ DESCRIPTION="GNU utilities to find files"
 SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 
-KEYWORDS="~x86 ~hppa arm"
+KEYWORDS="x86 amd64 ~hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/findutils/findutils-4.1.7-r3.ebuild b/sys-apps/findutils/findutils-4.1.7-r3.ebuild
index 98411fc14e79..b989b712a93d 100644
--- a/sys-apps/findutils/findutils-4.1.7-r3.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.4 2003/04/01 21:54:54 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build afs selinux"
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz
 
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 
-KEYWORDS="x86 ~hppa arm"
+KEYWORDS="x86 amd64 ~hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/findutils/findutils-4.1.7-r4.ebuild b/sys-apps/findutils/findutils-4.1.7-r4.ebuild
index b3859839b42c..14f52c8d88bc 100644
--- a/sys-apps/findutils/findutils-4.1.7-r4.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.8 2003/04/16 16:06:00 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build afs selinux"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
 
-KEYWORDS="x86 ~ppc sparc hppa ~arm alpha"
+KEYWORDS="x86 amd64 ~ppc sparc hppa ~arm alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/fxload/fxload-20020411.ebuild b/sys-apps/fxload/fxload-20020411.ebuild
index f1a3b21ec4b9..00438f181927 100644
--- a/sys-apps/fxload/fxload-20020411.ebuild
+++ b/sys-apps/fxload/fxload-20020411.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.11 2003/03/25 12:53:09 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 # source maintainers named it fxload-YYYY_MM_DD instead of fxload-YYYYMMDD
 MY_P=`echo $P|sed 's/-\(....\)\(..\)\(..\)/-\1_\2_\3/'`
@@ -8,7 +8,7 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="USB firmware uploader"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"
 HOMEPAGE="http://linux-hotplug.sourceforge.net"
-KEYWORDS="x86 ppc sparc ~hppa"
+KEYWORDS="x86 amd64 ppc sparc ~hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gawk/gawk-3.1.1-r2.ebuild b/sys-apps/gawk/gawk-3.1.1-r2.ebuild
index edb8fcb6da9d..92f9a8f8adb6 100644
--- a/sys-apps/gawk/gawk-3.1.1-r2.ebuild
+++ b/sys-apps/gawk/gawk-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.1-r2.ebuild,v 1.2 2003/05/11 16:43:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.1-r2.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="GNU awk pattern-matching language"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gawk/gawk-3.1.2-r3.ebuild b/sys-apps/gawk/gawk-3.1.2-r3.ebuild
index c796357cfd6f..6969aaa37228 100644
--- a/sys-apps/gawk/gawk-3.1.2-r3.ebuild
+++ b/sys-apps/gawk/gawk-3.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.2-r3.ebuild,v 1.6 2003/06/08 20:53:22 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.2-r3.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -11,7 +11,7 @@ DESCRIPTION="GNU awk pattern-matching language"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gluelog/gluelog-1.0-r2.ebuild b/sys-apps/gluelog/gluelog-1.0-r2.ebuild
index 61093baf3a77..929b6865ef4f 100644
--- a/sys-apps/gluelog/gluelog-1.0-r2.ebuild
+++ b/sys-apps/gluelog/gluelog-1.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0-r2.ebuild,v 1.11 2003/02/13 15:57:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0-r2.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Pipe and socket fittings for the system and kernel logs"
 HOMEPAGE="http://www.linuxuser.co.za/projects.php3"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 SRC_URI=""
diff --git a/sys-apps/gnumaniak/gnumaniak-1.8.ebuild b/sys-apps/gnumaniak/gnumaniak-1.8.ebuild
index 91734b39ef30..b2ba6a175045 100644
--- a/sys-apps/gnumaniak/gnumaniak-1.8.ebuild
+++ b/sys-apps/gnumaniak/gnumaniak-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnumaniak/gnumaniak-1.8.ebuild,v 1.4 2003/02/13 15:57:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnumaniak/gnumaniak-1.8.ebuild,v 1.5 2003/06/21 21:19:39 drobbins Exp $
 
 MY_PN=${PN/-/}
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.linalco.com/ragnar/"
 
 SLOT="0"
 LICENSE="LDP"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
 
 RDEPEND="sys-apps/man"
 
diff --git a/sys-apps/gpart/gpart-0.1h.ebuild b/sys-apps/gpart/gpart-0.1h.ebuild
index 4948eeddaa47..dff92cee1437 100644
--- a/sys-apps/gpart/gpart-0.1h.ebuild
+++ b/sys-apps/gpart/gpart-0.1h.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/gpart-0.1h.ebuild,v 1.3 2003/04/25 16:05:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/gpart-0.1h.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 RDEPEND="virtual/glibc"
 
diff --git a/sys-apps/gradm/gradm-1.9.10.ebuild b/sys-apps/gradm/gradm-1.9.10.ebuild
index 36b6b709065c..a5e4f70b3f35 100644
--- a/sys-apps/gradm/gradm-1.9.10.ebuild
+++ b/sys-apps/gradm/gradm-1.9.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.10.ebuild,v 1.1 2003/06/16 18:37:01 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.10.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
 SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
 HOMEPAGE="http://www.grsecurity.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~x86 ~sparc ~ppc"
+KEYWORDS="x86 amd64 ~sparc ~ppc"
 SLOT="0"
 
 IUSE=""
diff --git a/sys-apps/gradm/gradm-1.9.9h-r1.ebuild b/sys-apps/gradm/gradm-1.9.9h-r1.ebuild
index 586a8e2f95ae..1a32d4c6f047 100644
--- a/sys-apps/gradm/gradm-1.9.9h-r1.ebuild
+++ b/sys-apps/gradm/gradm-1.9.9h-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.9h-r1.ebuild,v 1.1 2003/05/17 02:33:34 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.9h-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Administrative interface for grsecuritys access control lists"
 SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
 HOMEPAGE="http://www.grsecurity.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 
 IUSE=""
diff --git a/sys-apps/gradm2/gradm2-0.0_pre4-r1.ebuild b/sys-apps/gradm2/gradm2-0.0_pre4-r1.ebuild
index fa0d1e0a8a3b..7c1ae03577fe 100644
--- a/sys-apps/gradm2/gradm2-0.0_pre4-r1.ebuild
+++ b/sys-apps/gradm2/gradm2-0.0_pre4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm2/gradm2-0.0_pre4-r1.ebuild,v 1.1 2003/06/14 05:20:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm2/gradm2-0.0_pre4-r1.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 MY_PV=2.0-pre4
 
@@ -9,7 +9,7 @@ DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
 SRC_URI="http://www.grsecurity.net/gradm-${MY_PV}.tar.gz"
 HOMEPAGE="http://www.grsecurity.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 amd64 ~sparc"
 SLOT="0"
 
 IUSE=""
diff --git a/sys-apps/gradm2/gradm2-0.0_pre4.ebuild b/sys-apps/gradm2/gradm2-0.0_pre4.ebuild
index a8ea0386a81e..9fb22a38975e 100644
--- a/sys-apps/gradm2/gradm2-0.0_pre4.ebuild
+++ b/sys-apps/gradm2/gradm2-0.0_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm2/gradm2-0.0_pre4.ebuild,v 1.2 2003/06/13 06:55:26 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm2/gradm2-0.0_pre4.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 MY_PV=2.0-pre4
 
@@ -9,7 +9,7 @@ DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
 SRC_URI="http://www.grsecurity.net/gradm-${MY_PV}.tar.gz"
 HOMEPAGE="http://www.grsecurity.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 amd64 ~sparc"
 SLOT="0"
 
 IUSE=""
diff --git a/sys-apps/grep/grep-2.4.2-r5.ebuild b/sys-apps/grep/grep-2.4.2-r5.ebuild
index 4eef596a96ae..afe1096657fe 100644
--- a/sys-apps/grep/grep-2.4.2-r5.ebuild
+++ b/sys-apps/grep/grep-2.4.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.4.2-r5.ebuild,v 1.8 2003/02/13 15:57:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.4.2-r5.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="GNU regular expression matcher"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/grep/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/grep/grep-2.5-r1.ebuild b/sys-apps/grep/grep-2.5-r1.ebuild
index 0d8e9d125ac3..d1b4f626ba9a 100644
--- a/sys-apps/grep/grep-2.5-r1.ebuild
+++ b/sys-apps/grep/grep-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5-r1.ebuild,v 1.17 2003/04/25 02:14:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5-r1.ebuild,v 1.18 2003/06/21 21:19:39 drobbins Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://prep.ai.mit.edu/gnu/${PN}/${P}.tar.gz
 	ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/grep/grep-2.5.1-r1.ebuild b/sys-apps/grep/grep-2.5.1-r1.ebuild
index 9d3ab51d8de4..7353eb2ab0cf 100644
--- a/sys-apps/grep/grep-2.5.1-r1.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r1.ebuild,v 1.3 2003/05/20 04:37:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r1.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 
 IUSE="nls build"
@@ -13,7 +13,7 @@ SRC_URI="ftp://prep.ai.mit.edu/gnu/${PN}/${P}.tar.gz
 	ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/grep/grep-2.5.1.ebuild b/sys-apps/grep/grep-2.5.1.ebuild
index acba77ba6e7b..9e215f6b9945 100644
--- a/sys-apps/grep/grep-2.5.1.ebuild
+++ b/sys-apps/grep/grep-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1.ebuild,v 1.2 2003/04/25 02:14:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://prep.ai.mit.edu/gnu/${PN}/${P}.tar.gz
 	ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/groff/groff-1.16.1-r1.ebuild b/sys-apps/groff/groff-1.16.1-r1.ebuild
index 503e0d28b2de..eeace15a06fc 100644
--- a/sys-apps/groff/groff-1.16.1-r1.ebuild
+++ b/sys-apps/groff/groff-1.16.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.16.1-r1.ebuild,v 1.15 2003/02/13 15:58:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.16.1-r1.ebuild,v 1.16 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 DEPEND="virtual/glibc"
 LICENSE="GPL-2"
diff --git a/sys-apps/groff/groff-1.17.2-r3.ebuild b/sys-apps/groff/groff-1.17.2-r3.ebuild
index 4b13caa06876..17ecd99fce74 100644
--- a/sys-apps/groff/groff-1.17.2-r3.ebuild
+++ b/sys-apps/groff/groff-1.17.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.17.2-r3.ebuild,v 1.6 2003/02/13 15:58:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.17.2-r3.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Text formatter used for man pages"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/groff/groff-1.18-r2.ebuild b/sys-apps/groff/groff-1.18-r2.ebuild
index e0826287579b..c5af9ab2609e 100644
--- a/sys-apps/groff/groff-1.18-r2.ebuild
+++ b/sys-apps/groff/groff-1.18-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18-r2.ebuild,v 1.2 2003/02/13 15:58:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18-r2.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Text formatter used for man pages"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/groff/groff-1.18-r3.ebuild b/sys-apps/groff/groff-1.18-r3.ebuild
index cae4e5dcd3bb..49962362db83 100644
--- a/sys-apps/groff/groff-1.18-r3.ebuild
+++ b/sys-apps/groff/groff-1.18-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18-r3.ebuild,v 1.2 2003/02/13 15:58:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18-r3.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Text formatter used for man pages"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/groff/groff-1.18.1-r1.ebuild b/sys-apps/groff/groff-1.18.1-r1.ebuild
index c5b23e189cbb..de384e9feb54 100644
--- a/sys-apps/groff/groff-1.18.1-r1.ebuild
+++ b/sys-apps/groff/groff-1.18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r1.ebuild,v 1.8 2003/05/19 00:43:19 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r1.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Text formatter used for man pages"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/groff/groff-1.18.1-r2.ebuild b/sys-apps/groff/groff-1.18.1-r2.ebuild
index 6ea5ce57df04..292a4cd72b14 100644
--- a/sys-apps/groff/groff-1.18.1-r2.ebuild
+++ b/sys-apps/groff/groff-1.18.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r2.ebuild,v 1.3 2003/06/19 01:10:25 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r2.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="X cjk"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz
 	cjk? ( http://people.debian.org/~ukai/groff/${MB_PATCH}.diff.gz )"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips hppa ~arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/groff/groff-1.18.1.ebuild b/sys-apps/groff/groff-1.18.1.ebuild
index 1b35dfafe9a8..a4781e306b4a 100644
--- a/sys-apps/groff/groff-1.18.1.ebuild
+++ b/sys-apps/groff/groff-1.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.ebuild,v 1.7 2003/02/13 15:58:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ DESCRIPTION="Text formatter used for man pages"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc alpha ~mips hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030516.ebuild b/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030516.ebuild
index 8ffccc7c0498..9c2c620f9ad9 100644
--- a/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030516.ebuild
+++ b/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030516.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030516.ebuild,v 1.1 2003/05/17 02:40:13 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030516.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/grsecurity-base-policy
 
 DESCRIPTION="Sample ACLS for grsecurity"
 SRC_URI="ftp://linbsd.net/pub/people/solar/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.linbsd.net/"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
 IUSE=""
 
 DEPEND="virtual/glibc \
-	sys-apps/fileutils \
-	sys-apps/textutils \
-	sys-apps/sh-utils \
 	sys-apps/sed"
 
 RDEPEND=">=sys-apps/gradm-1.9.9h-r1"
diff --git a/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030614.ebuild b/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030614.ebuild
index f0cd8b9f32e3..65c0d4926ef9 100644
--- a/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030614.ebuild
+++ b/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030614.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030614.ebuild,v 1.1 2003/06/14 19:54:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grsecurity-base-policy/grsecurity-base-policy-20030614.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/grsecurity-base-policy
 
 DESCRIPTION="Template access control lists for gentoo grsecurity"
 HOMEPAGE="http://cvs.gentoo.org/~solar/snapshots"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 SLOT="0"
 MAINTAINER="solar@gentoo.org"
 IUSE=""
 
 DEPEND="virtual/glibc \
-	sys-apps/fileutils \
-	sys-apps/textutils \
-	sys-apps/sh-utils \
 	sys-apps/sed"
 
 RDEPEND=">=sys-apps/gradm-1.9.9h-r1"
diff --git a/sys-apps/grub/grub-0.92-r1.ebuild b/sys-apps/grub/grub-0.92-r1.ebuild
index 4947a3b181c7..ecb05dd11555 100644
--- a/sys-apps/grub/grub-0.92-r1.ebuild
+++ b/sys-apps/grub/grub-0.92-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.92-r1.ebuild,v 1.11 2003/04/11 18:12:13 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.92-r1.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 
 DEPEND=">=sys-libs/ncurses-5.2-r5"
 
diff --git a/sys-apps/grub/grub-0.93.20030118.ebuild b/sys-apps/grub/grub-0.93.20030118.ebuild
index c8b604b24868..6ebc2f6204d8 100644
--- a/sys-apps/grub/grub-0.93.20030118.ebuild
+++ b/sys-apps/grub/grub-0.93.20030118.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.93.20030118.ebuild,v 1.7 2003/04/11 18:12:13 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.93.20030118.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -12,7 +12,7 @@ DESCRIPTION="GNU GRUB boot loader"
 SRC_URI="ftp://alpha.gnu.org/gnu/grub/${NEWP}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
 HOMEPAGE="http://www.gnu.org/software/grub/"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=sys-libs/ncurses-5.2-r5"
diff --git a/sys-apps/gtk-systrace/gtk-systrace-0.1-r1.ebuild b/sys-apps/gtk-systrace/gtk-systrace-0.1-r1.ebuild
index 80fa2f81eb00..62b70d3b4456 100644
--- a/sys-apps/gtk-systrace/gtk-systrace-0.1-r1.ebuild
+++ b/sys-apps/gtk-systrace/gtk-systrace-0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtk-systrace/gtk-systrace-0.1-r1.ebuild,v 1.2 2003/06/12 22:08:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtk-systrace/gtk-systrace-0.1-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="Systrace gtk notification gui"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/systrace/index.html"
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 S="${WORKDIR}/${P}"
 FILESDIR="${WORKDIR}/notification-0.1"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="gtk"
 DEPEND="sys-apps/systrace
 	gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
diff --git a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
index 9e208e9ee52c..5757a89d35ff 100644
--- a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
+++ b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.16 2003/03/15 03:25:49 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.17 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gtkpbbuttons is a PPC-only program to monitor special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -sparc -mips -alpha -arm"
+KEYWORDS="x86 amd64 -sparc -mips -alpha -arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
index 3c23993945e3..5e333213c5cd 100644
--- a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
+++ b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.6 2003/03/15 03:25:49 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gtkpbbuttons is a PPC-only program to monitor special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -mips -sparc -alpha -arm"
+KEYWORDS="x86 amd64 -mips -sparc -alpha -arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gzip/gzip-1.2.4a-r6.ebuild b/sys-apps/gzip/gzip-1.2.4a-r6.ebuild
index c14280920658..597d411cb5c0 100644
--- a/sys-apps/gzip/gzip-1.2.4a-r6.ebuild
+++ b/sys-apps/gzip/gzip-1.2.4a-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.2.4a-r6.ebuild,v 1.13 2003/02/13 15:59:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.2.4a-r6.ebuild,v 1.14 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU compressor"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/gzip/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 amd64 sparc "
 SLOT="0"
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
 RDEPEND="virtual/glibc"
diff --git a/sys-apps/gzip/gzip-1.3.2.ebuild b/sys-apps/gzip/gzip-1.3.2.ebuild
index 75194f175852..8c1d80384551 100644
--- a/sys-apps/gzip/gzip-1.3.2.ebuild
+++ b/sys-apps/gzip/gzip-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.2.ebuild,v 1.16 2003/02/13 15:59:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.2.ebuild,v 1.17 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU compressor"
 SRC_URI="ftp://alpha.gnu.org/gnu/gzip/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gzip/gzip-1.3.3-r1.ebuild b/sys-apps/gzip/gzip-1.3.3-r1.ebuild
index 34a937219a48..661c8fbf1504 100644
--- a/sys-apps/gzip/gzip-1.3.3-r1.ebuild
+++ b/sys-apps/gzip/gzip-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.3-r1.ebuild,v 1.8 2003/04/15 22:37:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.3-r1.ebuild,v 1.9 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Standard GNU compressor"
 SRC_URI="http://www.gzip.org/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
 
-KEYWORDS="x86 ~ppc sparc ~alpha hppa arm mips"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha hppa arm mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gzip/gzip-1.3.3-r2.ebuild b/sys-apps/gzip/gzip-1.3.3-r2.ebuild
index 55799b0e5b33..e8001b2b60ef 100644
--- a/sys-apps/gzip/gzip-1.3.3-r2.ebuild
+++ b/sys-apps/gzip/gzip-1.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.3-r2.ebuild,v 1.2 2003/06/14 14:28:15 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.3-r2.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Standard GNU compressor"
 SRC_URI="http://www.gzip.org/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
 
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gzip/gzip-1.3.3.ebuild b/sys-apps/gzip/gzip-1.3.3.ebuild
index 33f7eeddc7f8..18949dd47efa 100644
--- a/sys-apps/gzip/gzip-1.3.3.ebuild
+++ b/sys-apps/gzip/gzip-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.3.ebuild,v 1.6 2003/02/13 15:59:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.3.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 IUSE="nls build"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Standard GNU compressor"
 SRC_URI="http://www.gzip.org/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
 
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/gzip_x86/gzip_x86-0.90.ebuild b/sys-apps/gzip_x86/gzip_x86-0.90.ebuild
index 4ecd82b17295..7f1a82b35c9e 100644
--- a/sys-apps/gzip_x86/gzip_x86-0.90.ebuild
+++ b/sys-apps/gzip_x86/gzip_x86-0.90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip_x86/gzip_x86-0.90.ebuild,v 1.7 2003/02/28 16:55:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip_x86/gzip_x86-0.90.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="gzip_x86 is an optimized gzip for x86 arch.  5-45% speed increase is offered during decompression"
 HOMEPAGE="ftp://spruce.he.net/pub/jreiser"
 SRC_URI="ftp://spruce.he.net/pub/jreiser/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -ppc -sparc -alpha -arm -hppa -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -arm -hppa -mips"
 DEPEND=""
 
 S="${WORKDIR}/${P}"
diff --git a/sys-apps/hdparm/hdparm-5.2-r3.ebuild b/sys-apps/hdparm/hdparm-5.2-r3.ebuild
index 4c8d4d24acf4..c535b98d6373 100644
--- a/sys-apps/hdparm/hdparm-5.2-r3.ebuild
+++ b/sys-apps/hdparm/hdparm-5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.2-r3.ebuild,v 1.9 2003/03/31 19:20:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.2-r3.ebuild,v 1.10 2003/06/21 21:19:39 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/hdparm/hdparm-5.3-r1.ebuild b/sys-apps/hdparm/hdparm-5.3-r1.ebuild
index 1a3f22e0b472..12257242daa8 100644
--- a/sys-apps/hdparm/hdparm-5.3-r1.ebuild
+++ b/sys-apps/hdparm/hdparm-5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.3-r1.ebuild,v 1.6 2003/02/17 16:07:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.3-r1.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utility to change hard drive performance parameters"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha hppa"
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/hdparm/hdparm-5.3-r2.ebuild b/sys-apps/hdparm/hdparm-5.3-r2.ebuild
index 5c5c239a7b84..718cbc7aaf5e 100644
--- a/sys-apps/hdparm/hdparm-5.3-r2.ebuild
+++ b/sys-apps/hdparm/hdparm-5.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.3-r2.ebuild,v 1.7 2003/04/16 01:10:17 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.3-r2.ebuild,v 1.8 2003/06/21 21:19:39 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utility to change hard drive performance parameters"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha hppa"
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/help2man/help2man-1.29.ebuild b/sys-apps/help2man/help2man-1.29.ebuild
index ee825af2f8f6..f23a53df1e8c 100644
--- a/sys-apps/help2man/help2man-1.29.ebuild
+++ b/sys-apps/help2man/help2man-1.29.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.29.ebuild,v 1.12 2003/06/13 11:00:31 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.29.ebuild,v 1.13 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="http://www.gnu.org/software/help2man"
 SRC_URI="http://ftp.gnu.org/gnu/help2man/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha hppa mips arm"
+KEYWORDS="x86 amd64 ppc sparc ~alpha hppa mips arm"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/sys-apps/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-apps/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
index 3c4812f5aeb8..5da6cd36e304 100644
--- a/sys-apps/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ b/sys-apps/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.2 2003/03/30 19:28:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 MY_P="hfsplus_${PV}"
 DESCRIPTION="HFS+ Filesystem Access Utilities (PPC Only)"
 SRC_URI="http://ftp.penguinppc.org/users/hasi/${MY_P}.src.tar.bz2"
 HOMEPAGE="http://ftp.penguinppc.org/users/hasi/"
 
-KEYWORDS="~x86 ~ppc -sparc -alpha"
+KEYWORDS="x86 amd64 ~ppc -sparc -alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild b/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild
index b926c0ab05cf..32659ccdfa1d 100644
--- a/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild
+++ b/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild,v 1.14 2003/02/13 15:59:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild,v 1.15 2003/06/21 21:19:39 drobbins Exp $
 
 MY_P="hfsplus_${PV}"
 DESCRIPTION="HFS+ Filesystem Access Utilities (PPC Only)"
 SRC_URI="http://ftp.penguinppc.org/users/hasi/${MY_P}.src.tar.bz2"
 HOMEPAGE="http://ftp.penguinppc.org/users/hasi/"
 
-KEYWORDS="x86 ppc -sparc -alpha"
+KEYWORDS="x86 amd64 ppc -sparc -alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/hfsutils/hfsutils-3.2.6-r1.ebuild b/sys-apps/hfsutils/hfsutils-3.2.6-r1.ebuild
index f16fe073beb8..0152597f012c 100644
--- a/sys-apps/hfsutils/hfsutils-3.2.6-r1.ebuild
+++ b/sys-apps/hfsutils/hfsutils-3.2.6-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6-r1.ebuild,v 1.2 2003/02/13 16:00:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6-r1.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="HFS FS Access utils"
 SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
 IUSE="tcltk"
 
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 amd64 ~ppc -sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hfsutils/hfsutils-3.2.6-r2.ebuild b/sys-apps/hfsutils/hfsutils-3.2.6-r2.ebuild
index 35b4c983f921..af22dc5db3da 100644
--- a/sys-apps/hfsutils/hfsutils-3.2.6-r2.ebuild
+++ b/sys-apps/hfsutils/hfsutils-3.2.6-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6-r2.ebuild,v 1.1 2003/03/31 15:51:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6-r2.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="HFS FS Access utils"
 SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
 IUSE="tcltk"
 
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 amd64 ~ppc -sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hfsutils/hfsutils-3.2.6-r3.ebuild b/sys-apps/hfsutils/hfsutils-3.2.6-r3.ebuild
index 18dbf6258d33..feda614d6ed1 100644
--- a/sys-apps/hfsutils/hfsutils-3.2.6-r3.ebuild
+++ b/sys-apps/hfsutils/hfsutils-3.2.6-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6-r3.ebuild,v 1.1 2003/04/11 04:50:33 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6-r3.ebuild,v 1.2 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="HFS FS Access utils"
 SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
 IUSE="tcltk"
 
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 amd64 ~ppc -sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hfsutils/hfsutils-3.2.6.ebuild b/sys-apps/hfsutils/hfsutils-3.2.6.ebuild
index 4bcc073eb0f9..ef26193983bd 100644
--- a/sys-apps/hfsutils/hfsutils-3.2.6.ebuild
+++ b/sys-apps/hfsutils/hfsutils-3.2.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6.ebuild,v 1.12 2003/02/13 16:00:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsutils/hfsutils-3.2.6.ebuild,v 1.13 2003/06/21 21:19:39 drobbins Exp $
 
 DESCRIPTION="HFS FS Access utils"
 SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
 
-KEYWORDS="x86 ppc -sparc"
+KEYWORDS="x86 amd64 ppc -sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hotplug/hotplug-20020114.ebuild b/sys-apps/hotplug/hotplug-20020114.ebuild
index d92fd3ecff09..35356151b4b4 100644
--- a/sys-apps/hotplug/hotplug-20020114.ebuild
+++ b/sys-apps/hotplug/hotplug-20020114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020114.ebuild,v 1.12 2003/03/11 07:38:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020114.ebuild,v 1.13 2003/06/21 21:19:39 drobbins Exp $
 
 # source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
 MY_P=${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="x86 amd64 ppc sparc"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20020401-r1.ebuild b/sys-apps/hotplug/hotplug-20020401-r1.ebuild
index 32306aec9a9b..e644501a456e 100644
--- a/sys-apps/hotplug/hotplug-20020401-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20020401-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020401-r1.ebuild,v 1.5 2003/03/11 07:38:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020401-r1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20020826-r1.ebuild b/sys-apps/hotplug/hotplug-20020826-r1.ebuild
index 41fe7065b156..efe18460ea04 100644
--- a/sys-apps/hotplug/hotplug-20020826-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20020826-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826-r1.ebuild,v 1.3 2003/06/11 00:23:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826-r1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~hppa"
+KEYWORDS="x86 amd64 ppc ~hppa"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20020826-r2.ebuild b/sys-apps/hotplug/hotplug-20020826-r2.ebuild
index bbb7d7ce597a..f2396cdf5a26 100644
--- a/sys-apps/hotplug/hotplug-20020826-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20020826-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826-r2.ebuild,v 1.2 2003/06/11 00:23:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826-r2.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~hppa"
+KEYWORDS="x86 amd64 ppc ~hppa"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20020826.ebuild b/sys-apps/hotplug/hotplug-20020826.ebuild
index 72c976b1e9f7..8370b4220337 100644
--- a/sys-apps/hotplug/hotplug-20020826.ebuild
+++ b/sys-apps/hotplug/hotplug-20020826.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826.ebuild,v 1.6 2003/06/11 00:23:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 amd64 ppc"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20030501-r1.ebuild b/sys-apps/hotplug/hotplug-20030501-r1.ebuild
index 2077f504ffe4..1ae05d37e5a1 100644
--- a/sys-apps/hotplug/hotplug-20030501-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20030501-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501-r1.ebuild,v 1.1 2003/05/27 22:29:13 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~hppa"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20030501-r2.ebuild b/sys-apps/hotplug/hotplug-20030501-r2.ebuild
index 0e8ae701826d..b883ffa4136b 100644
--- a/sys-apps/hotplug/hotplug-20030501-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20030501-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501-r2.ebuild,v 1.2 2003/06/12 02:14:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501-r2.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~hppa ~sparc"
+KEYWORDS="x86 amd64 ~ppc ~hppa ~sparc"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hotplug/hotplug-20030501.ebuild b/sys-apps/hotplug/hotplug-20030501.ebuild
index 394bb1476dc9..3f98c652a7ad 100644
--- a/sys-apps/hotplug/hotplug-20030501.ebuild
+++ b/sys-apps/hotplug/hotplug-20030501.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501.ebuild,v 1.1 2003/05/03 18:34:38 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~hppa"
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9
diff --git a/sys-apps/hwdata-knoppix/hwdata-knoppix-0.8.ebuild b/sys-apps/hwdata-knoppix/hwdata-knoppix-0.8.ebuild
index 3c41806d03c7..de4f7f06eaf5 100644
--- a/sys-apps/hwdata-knoppix/hwdata-knoppix-0.8.ebuild
+++ b/sys-apps/hwdata-knoppix/hwdata-knoppix-0.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/hwdata-knoppix-0.8.ebuild,v 1.2 2003/03/26 19:00:46 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/hwdata-knoppix-0.8.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="data hwsetup program"
 SRC_URI="http://www.knopper.net/download/knoppix/hwdata-knoppix_0.8-3.tar.gz"
 HOMEPAGE="http://www.knopper.net"
 
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hwsetup/hwsetup-1.0.ebuild b/sys-apps/hwsetup/hwsetup-1.0.ebuild
index a5b61930c1dc..a75345df2d19 100644
--- a/sys-apps/hwsetup/hwsetup-1.0.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0.ebuild,v 1.3 2003/03/26 19:01:12 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Hardware setup program"
 SRC_URI="mirror://gentoo/hwsetup_1.0-9.tar.gz"
 HOMEPAGE="http://www.knopper.net"
 
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/i2c/i2c-2.6.5-r1.ebuild b/sys-apps/i2c/i2c-2.6.5-r1.ebuild
index e36db3fc08a1..21bd8e80da4a 100644
--- a/sys-apps/i2c/i2c-2.6.5-r1.ebuild
+++ b/sys-apps/i2c/i2c-2.6.5-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.6.5-r1.ebuild,v 1.2 2003/02/13 16:01:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.6.5-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="I2C Bus support"
 SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 amd64 ppc"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/sys-apps/i2c/i2c-2.7.0.ebuild b/sys-apps/i2c/i2c-2.7.0.ebuild
index ccc60582a46f..2155b3d01c76 100644
--- a/sys-apps/i2c/i2c-2.7.0.ebuild
+++ b/sys-apps/i2c/i2c-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.7.0.ebuild,v 1.4 2003/03/02 19:31:05 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.7.0.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="I2C Bus support"
@@ -8,7 +8,7 @@ SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 
 DEPEND="virtual/linux-sources"
diff --git a/sys-apps/i8kutils/i8kutils-1.17.ebuild b/sys-apps/i8kutils/i8kutils-1.17.ebuild
index d892cd50d52b..7f46f8e16dfc 100644
--- a/sys-apps/i8kutils/i8kutils-1.17.ebuild
+++ b/sys-apps/i8kutils/i8kutils-1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i8kutils/i8kutils-1.17.ebuild,v 1.5 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i8kutils/i8kutils-1.17.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}/
 DESCRIPTION="Dell Inspiron and Latitude utilities"
@@ -12,7 +12,7 @@ DEPEND="virtual/glibc
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="tcltk"
-KEYWORDS="~x86 -mips"
+KEYWORDS="x86 amd64 -mips"
 
 
 src_compile() {
diff --git a/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild b/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild
index c76156e90f14..1ff16e3441a3 100644
--- a/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild,v 1.1 2003/03/21 15:58:05 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
 HOMEPAGE="http://www.stud.uni-hamburg.de/users/lennart/projects/ifplugd"
 SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND=""
 #RDEPEND=""
diff --git a/sys-apps/iproute/iproute-20010824-r1.ebuild b/sys-apps/iproute/iproute-20010824-r1.ebuild
index 0ddb639f9c25..e0af49908415 100644
--- a/sys-apps/iproute/iproute-20010824-r1.ebuild
+++ b/sys-apps/iproute/iproute-20010824-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r1.ebuild,v 1.9 2003/02/10 09:58:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r1.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.worldbank.ro/ip-routing/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="x86 amd64 ppc sparc"
 
 DEPEND="virtual/linux-sources"
 
diff --git a/sys-apps/iproute/iproute-20010824-r2.ebuild b/sys-apps/iproute/iproute-20010824-r2.ebuild
index 9589988e7a41..b9f4d7085cd1 100644
--- a/sys-apps/iproute/iproute-20010824-r2.ebuild
+++ b/sys-apps/iproute/iproute-20010824-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r2.ebuild,v 1.8 2003/04/17 15:33:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r2.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.worldbank.ro/ip-routing/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ~ppc sparc alpha hppa"
 
 DEPEND="virtual/linux-sources"
 
diff --git a/sys-apps/iproute/iproute-20010824-r3.ebuild b/sys-apps/iproute/iproute-20010824-r3.ebuild
index 70afd377bff5..9162e4ad0816 100644
--- a/sys-apps/iproute/iproute-20010824-r3.ebuild
+++ b/sys-apps/iproute/iproute-20010824-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r3.ebuild,v 1.2 2003/05/27 11:20:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r3.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.worldbank.ro/ip-routing/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa"
 
 DEPEND="virtual/linux-sources
 		>=sys-apps/sed-4"
diff --git a/sys-apps/irda-utils/irda-utils-0.9.13.ebuild b/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
index ca64b7dd8ba4..6e64fa410838 100644
--- a/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
+++ b/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.13.ebuild,v 1.13 2003/02/13 16:01:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.13.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="IrDA Utilities, tools for IrDA communication"
 SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
 HOMEPAGE="http://irda.sourceforge.net/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/irda-utils/irda-utils-0.9.15.ebuild b/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
index db5d9cb8585d..96b517271547 100644
--- a/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
+++ b/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.5 2003/06/12 22:09:15 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="IrDA Utilities, tools for IrDA communication"
 SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
 HOMEPAGE="http://irda.sf.net"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
index 3aa7eb825844..b35b878a57c9 100644
--- a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild,v 1.10 2003/02/13 16:01:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Tools for configuring ISA PnP devices"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
index f4a31b56159d..ba1710f54f22 100644
--- a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild,v 1.9 2003/02/13 16:01:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Tools for configuring ISA PnP devices"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/isapnptools/isapnptools-1.26.ebuild b/sys-apps/isapnptools/isapnptools-1.26.ebuild
index cfe365abf5c7..22b1209baff5 100644
--- a/sys-apps/isapnptools/isapnptools-1.26.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.26.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26.ebuild,v 1.10 2003/02/13 16:02:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools for configuring ISA PnP devices"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/jfsutils/jfsutils-1.1.0-r1.ebuild b/sys-apps/jfsutils/jfsutils-1.1.0-r1.ebuild
index f3345e3bcb41..49dd6c3ab023 100644
--- a/sys-apps/jfsutils/jfsutils-1.1.0-r1.ebuild
+++ b/sys-apps/jfsutils/jfsutils-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.0-r1.ebuild,v 1.2 2003/02/13 16:02:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.0-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -8,7 +8,7 @@ DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/jfsutils/jfsutils-1.1.0-r2.ebuild b/sys-apps/jfsutils/jfsutils-1.1.0-r2.ebuild
index 0e97d9e00adb..9091d1d032e2 100644
--- a/sys-apps/jfsutils/jfsutils-1.1.0-r2.ebuild
+++ b/sys-apps/jfsutils/jfsutils-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.0-r2.ebuild,v 1.3 2003/02/13 16:02:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.0-r2.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -8,7 +8,7 @@ DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/jfsutils/jfsutils-1.1.1-r1.ebuild b/sys-apps/jfsutils/jfsutils-1.1.1-r1.ebuild
index 303fa0d3c746..172e77f4e0ae 100644
--- a/sys-apps/jfsutils/jfsutils-1.1.1-r1.ebuild
+++ b/sys-apps/jfsutils/jfsutils-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.1-r1.ebuild,v 1.1 2003/03/11 04:30:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.1-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/jfsutils/jfsutils-1.1.1.ebuild b/sys-apps/jfsutils/jfsutils-1.1.1.ebuild
index 3e43f94a1264..77e857d3a74a 100644
--- a/sys-apps/jfsutils/jfsutils-1.1.1.ebuild
+++ b/sys-apps/jfsutils/jfsutils-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.1.ebuild,v 1.3 2003/02/13 16:02:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -8,7 +8,7 @@ DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/jfsutils/jfsutils-1.1.2.ebuild b/sys-apps/jfsutils/jfsutils-1.1.2.ebuild
index 32a298798d05..ec14b9f2051e 100644
--- a/sys-apps/jfsutils/jfsutils-1.1.2.ebuild
+++ b/sys-apps/jfsutils/jfsutils-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.2.ebuild,v 1.3 2003/05/16 19:32:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/jfsutils/jfsutils-1.1.2.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
@@ -9,7 +9,7 @@ SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~hppa"
+KEYWORDS="x86 amd64 -ppc ~hppa"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/kbd/kbd-1.06-r1.ebuild b/sys-apps/kbd/kbd-1.06-r1.ebuild
index fe1dc1c03347..59dfaddf4978 100644
--- a/sys-apps/kbd/kbd-1.06-r1.ebuild
+++ b/sys-apps/kbd/kbd-1.06-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.06-r1.ebuild,v 1.20 2003/05/20 21:06:44 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.06-r1.ebuild,v 1.21 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Keyboard and console utilities"
 SRC_URI="ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/${P}.tar.gz"
 HOMEPAGE="http://freshmeat.net/projects/kbd/"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
diff --git a/sys-apps/kudzu/kudzu-0.99.66.ebuild b/sys-apps/kudzu/kudzu-0.99.66.ebuild
index 65ec27f7fc59..71de3402ee96 100644
--- a/sys-apps/kudzu/kudzu-0.99.66.ebuild
+++ b/sys-apps/kudzu/kudzu-0.99.66.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-0.99.66.ebuild,v 1.7 2003/03/26 19:01:41 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-0.99.66.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Red Hat Hardware detection tools"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.knopper.net"
 
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/less/less-376.ebuild b/sys-apps/less/less-376.ebuild
index 6a2434d7ebde..7790b92eea31 100644
--- a/sys-apps/less/less-376.ebuild
+++ b/sys-apps/less/less-376.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-376.ebuild,v 1.13 2003/02/13 16:02:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-376.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 S=${WORKDIR}/${P}
diff --git a/sys-apps/less/less-378-r1.ebuild b/sys-apps/less/less-378-r1.ebuild
index 2428156e8982..6a9718fc054f 100644
--- a/sys-apps/less/less-378-r1.ebuild
+++ b/sys-apps/less/less-378-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r1.ebuild,v 1.6 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r1.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
-KEYWORDS="x86 ~ppc ~sparc alpha hppa mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc alpha hppa mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/less/less-378-r2.ebuild b/sys-apps/less/less-378-r2.ebuild
index b1072bb7bb08..a88fdaa34715 100644
--- a/sys-apps/less/less-378-r2.ebuild
+++ b/sys-apps/less/less-378-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r2.ebuild,v 1.6 2003/03/20 06:23:18 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r2.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/less/less-378.ebuild b/sys-apps/less/less-378.ebuild
index 1f525cbd1520..e189a2fff26a 100644
--- a/sys-apps/less/less-378.ebuild
+++ b/sys-apps/less/less-378.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378.ebuild,v 1.9 2003/02/13 16:02:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 SLOT="0"
 LICENSE="GPL-2"
 S=${WORKDIR}/${P}
diff --git a/sys-apps/less/less-381.ebuild b/sys-apps/less/less-381.ebuild
index 269f3248f729..8dd82a1e0cad 100644
--- a/sys-apps/less/less-381.ebuild
+++ b/sys-apps/less/less-381.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-381.ebuild,v 1.5 2003/04/16 00:39:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-381.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
-KEYWORDS="x86 ~alpha sparc ppc ~mips ~arm hppa"
+KEYWORDS="x86 amd64 ~alpha sparc ppc ~mips ~arm hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/lilo/lilo-22.1-r3.ebuild b/sys-apps/lilo/lilo-22.1-r3.ebuild
index 1dc7ffb63634..4c9f8cb5364a 100644
--- a/sys-apps/lilo/lilo-22.1-r3.ebuild
+++ b/sys-apps/lilo/lilo-22.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.1-r3.ebuild,v 1.18 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.1-r3.ebuild,v 1.19 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 
 DEPEND=">=sys-devel/bin86-0.15.5"
 
diff --git a/sys-apps/lilo/lilo-22.3.3-r1.ebuild b/sys-apps/lilo/lilo-22.3.3-r1.ebuild
index c040ff6c49a4..44ce93202a2c 100644
--- a/sys-apps/lilo/lilo-22.3.3-r1.ebuild
+++ b/sys-apps/lilo/lilo-22.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.3.3-r1.ebuild,v 1.9 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.3.3-r1.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/"
 
 SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 
 DEPEND="dev-lang/nasm
 	>=sys-devel/bin86-0.15.5"
diff --git a/sys-apps/lilo/lilo-22.3.4.ebuild b/sys-apps/lilo/lilo-22.3.4.ebuild
index 97cc24aa5279..e5cb9be8b7e9 100644
--- a/sys-apps/lilo/lilo-22.3.4.ebuild
+++ b/sys-apps/lilo/lilo-22.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.3.4.ebuild,v 1.6 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.3.4.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/"
 
 SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -sparc -alpha -mips"
 
 DEPEND="dev-lang/nasm
 	>=sys-devel/bin86-0.15.5"
diff --git a/sys-apps/lilo/lilo-22.5.1.ebuild b/sys-apps/lilo/lilo-22.5.1.ebuild
index f960182f7e58..c24874661f65 100644
--- a/sys-apps/lilo/lilo-22.5.1.ebuild
+++ b/sys-apps/lilo/lilo-22.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.1.ebuild,v 1.3 2003/04/04 19:38:04 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/"
 
 SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="-* ~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND="dev-lang/nasm
 	>=sys-devel/bin86-0.15.5"
diff --git a/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild b/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild
index 4129f6b6d006..ea61e3a062d1 100644
--- a/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild
+++ b/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild,v 1.3 2003/02/13 16:03:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Utilities and library for accessing NTFS filesystems"
 HOMEPAGE="http://linux-ntfs.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
 DEPEND=">=sys-devel/gcc-2.95"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild b/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
index 6beb57dc017b..14c2f13fdb5e 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild,v 1.1 2003/05/29 09:13:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="x86 amd64 ppc sparc"
 
 DEPEND="virtual/linux-sources"
 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild b/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild
index e052fd83a1b0..1586138cea97 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild,v 1.2 2003/06/16 14:30:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ SLOT="0"
 # gentoo-sources-2.4.20-r1 and xfs-sources-2.4.20-r1 will
 # have support for this package, do not change these to ~ 
 # until your arch has i2c-2.7.0 in it's kernel.
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 amd64 -ppc -sparc"
 LICENSE="GPL-2"
 
 DEPEND="|| (
diff --git a/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild b/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild
index f10bcdd5915b..83ce7f67d5dd 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild,v 1.1 2003/05/29 09:13:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 # gentoo-sources-2.4.20-r1 and xfs-sources-2.4.20-r1 will
 # have support for this package, do not change these to ~ 
 # until your arch has i2c-2.7.0 in it's kernel.
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 amd64 -ppc -sparc"
 LICENSE="GPL-2"
 
 DEPEND="|| (
diff --git a/sys-apps/logwatch/logwatch-4.2.1-r1.ebuild b/sys-apps/logwatch/logwatch-4.2.1-r1.ebuild
index 528b01a2ea8f..bf9855c4f241 100644
--- a/sys-apps/logwatch/logwatch-4.2.1-r1.ebuild
+++ b/sys-apps/logwatch/logwatch-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.2.1-r1.ebuild,v 1.1 2003/05/02 06:47:50 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.2.1-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="LogWatch, a customizable log analysis system"
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc
 		net-mail/mailx"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 IUSE=""
 RDEPEND=""
diff --git a/sys-apps/logwatch/logwatch-4.2.1.ebuild b/sys-apps/logwatch/logwatch-4.2.1.ebuild
index c67850f777ad..fa630318f85a 100644
--- a/sys-apps/logwatch/logwatch-4.2.1.ebuild
+++ b/sys-apps/logwatch/logwatch-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.2.1.ebuild,v 1.6 2003/04/11 06:23:45 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.2.1.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="LogWatch, a customizable log analysis system"
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc
 		net-mail/mailx"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 IUSE=""
 RDEPEND=""
diff --git a/sys-apps/logwatch/logwatch-4.3.1-r1.ebuild b/sys-apps/logwatch/logwatch-4.3.1-r1.ebuild
index 528fc6ba87aa..1509787c591b 100644
--- a/sys-apps/logwatch/logwatch-4.3.1-r1.ebuild
+++ b/sys-apps/logwatch/logwatch-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.1-r1.ebuild,v 1.1 2003/05/02 06:47:50 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.1-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="LogWatch, a customizable log analysis system"
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc
 		net-mail/mailx"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 IUSE=""
 RDEPEND=""
diff --git a/sys-apps/logwatch/logwatch-4.3.1.ebuild b/sys-apps/logwatch/logwatch-4.3.1.ebuild
index 8c1eb9f2caae..e0317536b3e9 100644
--- a/sys-apps/logwatch/logwatch-4.3.1.ebuild
+++ b/sys-apps/logwatch/logwatch-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.1.ebuild,v 1.5 2003/04/11 06:23:45 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="LogWatch, a customizable log analysis system"
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc
 		net-mail/mailx"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 IUSE=""
 RDEPEND=""
diff --git a/sys-apps/logwatch/logwatch-4.3.2.ebuild b/sys-apps/logwatch/logwatch-4.3.2.ebuild
index d5816b09916c..3909fa08c279 100644
--- a/sys-apps/logwatch/logwatch-4.3.2.ebuild
+++ b/sys-apps/logwatch/logwatch-4.3.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.2.ebuild,v 1.1 2003/04/11 06:06:38 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.2.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND="virtual/glibc
 	virtual/cron
diff --git a/sys-apps/lshw/lshw-01.00.ebuild b/sys-apps/lshw/lshw-01.00.ebuild
index d572c6252330..01ba2d38ee49 100644
--- a/sys-apps/lshw/lshw-01.00.ebuild
+++ b/sys-apps/lshw/lshw-01.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.00.ebuild,v 1.1 2003/04/15 15:15:46 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.00.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P="${P/-/-A.}"
 DESCRIPTION="Hardware Lister"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/lsof/lsof-4.64.ebuild b/sys-apps/lsof/lsof-4.64.ebuild
index 91a0b743b2b0..2c154cc8d41e 100644
--- a/sys-apps/lsof/lsof-4.64.ebuild
+++ b/sys-apps/lsof/lsof-4.64.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.64.ebuild,v 1.13 2003/04/14 16:49:09 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.64.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}/${MY_P}_src
@@ -13,7 +13,7 @@ DEPEND="virtual/glibc"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa"
 
 #This pkg appears to be highly kernel-dependent.
 
diff --git a/sys-apps/lsof/lsof-4.67.ebuild b/sys-apps/lsof/lsof-4.67.ebuild
index 408157a38bfa..bd88654f2102 100644
--- a/sys-apps/lsof/lsof-4.67.ebuild
+++ b/sys-apps/lsof/lsof-4.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.67.ebuild,v 1.1 2003/05/20 07:28:52 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.67.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 MY_P=${P/-/_}
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa arm"
 
 #This pkg appears to be highly kernel-dependent.
 
diff --git a/sys-apps/lufs/lufs-0.7.0.ebuild b/sys-apps/lufs/lufs-0.7.0.ebuild
index d4fde0225c5c..2885d583ca1d 100644
--- a/sys-apps/lufs/lufs-0.7.0.ebuild
+++ b/sys-apps/lufs/lufs-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.7.0.ebuild,v 1.4 2003/02/13 16:03:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.7.0.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 #RDEPEND=""
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-apps/lufs/lufs-0.8.0-r1.ebuild b/sys-apps/lufs/lufs-0.8.0-r1.ebuild
index ca01b7d1fa0a..b14cce15cce1 100644
--- a/sys-apps/lufs/lufs-0.8.0-r1.ebuild
+++ b/sys-apps/lufs/lufs-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.8.0-r1.ebuild,v 1.2 2003/02/13 16:03:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.8.0-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 #RDEPEND
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-apps/lufs/lufs-0.8.0.ebuild b/sys-apps/lufs/lufs-0.8.0.ebuild
index a7ff7f35be3c..2343291d0b13 100644
--- a/sys-apps/lufs/lufs-0.8.0.ebuild
+++ b/sys-apps/lufs/lufs-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.8.0.ebuild,v 1.3 2003/02/13 16:03:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.8.0.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 #RDEPEND
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-apps/lufs/lufs-0.9.3.ebuild b/sys-apps/lufs/lufs-0.9.3.ebuild
index 947a8a910375..92f4a8b8739e 100644
--- a/sys-apps/lufs/lufs-0.9.3.ebuild
+++ b/sys-apps/lufs/lufs-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.9.3.ebuild,v 1.4 2003/03/18 11:38:38 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.9.3.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 #RDEPEND
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-apps/lufs/lufs-0.9.4.ebuild b/sys-apps/lufs/lufs-0.9.4.ebuild
index 5ecb6f7574ee..fd01a02df082 100644
--- a/sys-apps/lufs/lufs-0.9.4.ebuild
+++ b/sys-apps/lufs/lufs-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.9.4.ebuild,v 1.1 2003/03/18 11:38:38 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.9.4.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 #RDEPEND
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-apps/lufs/lufs-0.9.5.ebuild b/sys-apps/lufs/lufs-0.9.5.ebuild
index 0d92dbb209de..f5390d694366 100644
--- a/sys-apps/lufs/lufs-0.9.5.ebuild
+++ b/sys-apps/lufs/lufs-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.9.5.ebuild,v 1.2 2003/04/26 13:22:17 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lufs/lufs-0.9.5.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 RDEPEND=""
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild b/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
index 4d2c5c300c0a..9d12e642e467 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild,v 1.7 2003/02/25 18:58:08 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 NV=1.0.1-rc4
 S=${WORKDIR}/LVM/${NV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
 HOMEPAGE="http://www.mosix.org"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
 
diff --git a/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild b/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild
index ee5ba7ce5594..908a8790b633 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild,v 1.9 2003/02/25 18:58:08 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 #our version, but with "eh" formatting
 NV=1.0.1-rc4
@@ -8,7 +8,7 @@ S=${WORKDIR}/LVM/${NV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
 HOMEPAGE="http://www.mosix.org"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
 
diff --git a/sys-apps/lvm-user/lvm-user-1.0.3.ebuild b/sys-apps/lvm-user/lvm-user-1.0.3.ebuild
index 9478fbab4d1b..668c4a716353 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.3.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.3.ebuild,v 1.9 2003/02/25 18:58:08 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.3.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 NV=1.0.3
 S=${WORKDIR}/LVM/${NV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 amd64 sparc "
 SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
 
diff --git a/sys-apps/lvm-user/lvm-user-1.0.4.ebuild b/sys-apps/lvm-user/lvm-user-1.0.4.ebuild
index 176045379299..31384145cebc 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.4.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.4.ebuild,v 1.10 2003/02/25 18:58:08 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.4.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 NV=1.0.4
 S=${WORKDIR}/LVM/${NV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 amd64 -ppc sparc "
 
 DEPEND="virtual/glibc
 	virtual/linux-sources"
diff --git a/sys-apps/lvm-user/lvm-user-1.0.5.ebuild b/sys-apps/lvm-user/lvm-user-1.0.5.ebuild
index eca66c286d26..6d3dc86b0992 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.5.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.5.ebuild,v 1.9 2003/02/25 18:58:08 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.5.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/LVM/${PV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 amd64 -ppc sparc "
 
 DEPEND="virtual/glibc
 	virtual/linux-sources"
diff --git a/sys-apps/lvm-user/lvm-user-1.0.6.ebuild b/sys-apps/lvm-user/lvm-user-1.0.6.ebuild
index d373f5d804d7..d1caa4bf11a1 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.6.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.6.ebuild,v 1.6 2003/02/23 21:48:58 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.6.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="static"
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/LVM/${PV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-KEYWORDS="x86 -ppc ~sparc"
+KEYWORDS="x86 amd64 -ppc ~sparc"
 
 # I have confirmed with the EVMS development team and from testing that
 # evms-1.0.6 no longer requires kernel sources to be installed to compile
diff --git a/sys-apps/lvm-user/lvm-user-1.0.7.ebuild b/sys-apps/lvm-user/lvm-user-1.0.7.ebuild
index 9fd3d0bc2fda..89226dbac2cf 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.7.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.7.ebuild,v 1.3 2003/04/09 15:48:12 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.7.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="static"
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/LVM/${PV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
 SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-KEYWORDS="x86 -ppc sparc ~hppa"
+KEYWORDS="x86 amd64 -ppc sparc ~hppa"
 
 DEPEND=">=sys-apps/sed-4.0 virtual/linux-sources"
 RDEPEND=""
diff --git a/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild b/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild
index 976aecf8f334..bb05b30fa28a 100644
--- a/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild
+++ b/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild,v 1.10 2003/02/13 16:04:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DEBRV=8
@@ -10,7 +10,7 @@ SRC_URI="http://http.us.debian.org/debian/pool/main/m/mac-fdisk/${PN}_${PV}.orig
 HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc  -alpha"
+KEYWORDS="x86 amd64 -sparc  -alpha"
 DEPEND="virtual/glibc"
 
 src_unpack() {
diff --git a/sys-apps/man-pages/man-pages-1.54.ebuild b/sys-apps/man-pages/man-pages-1.54.ebuild
index 9e3883224b89..6ce88e1e9477 100644
--- a/sys-apps/man-pages/man-pages-1.54.ebuild
+++ b/sys-apps/man-pages/man-pages-1.54.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.54.ebuild,v 1.6 2003/05/25 15:13:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.54.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 MY_PN=${PN/-/}
 S=${WORKDIR}/${P}
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
 SRC_URI="mirror://kernel/linux/docs/${MY_PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 RDEPEND="sys-apps/man"
 LICENSE="GPL-2"
diff --git a/sys-apps/man-pages/man-pages-1.55.ebuild b/sys-apps/man-pages/man-pages-1.55.ebuild
index e95c062a7064..47d08143d68a 100644
--- a/sys-apps/man-pages/man-pages-1.55.ebuild
+++ b/sys-apps/man-pages/man-pages-1.55.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.55.ebuild,v 1.6 2003/05/25 15:13:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.55.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 MY_PN=${PN/-/}
 S=${WORKDIR}/${P}
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
 SRC_URI="mirror://kernel/linux/docs/${MY_PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
-KEYWORDS="~x86 ~ppc ~sparc alpha mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc alpha mips ~hppa ~arm"
 
 RDEPEND="sys-apps/man"
 LICENSE="GPL-2"
diff --git a/sys-apps/man-pages/man-pages-1.56.ebuild b/sys-apps/man-pages/man-pages-1.56.ebuild
index 28f54104dedb..30c2dad5ebbe 100644
--- a/sys-apps/man-pages/man-pages-1.56.ebuild
+++ b/sys-apps/man-pages/man-pages-1.56.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.56.ebuild,v 1.2 2003/05/25 15:13:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.56.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 MY_PN=${PN/-/}
 S=${WORKDIR}/${P}
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
 SRC_URI="mirror://kernel/linux/docs/${MY_PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 RDEPEND="sys-apps/man"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/man/man-1.5i-r3.ebuild b/sys-apps/man/man-1.5i-r3.ebuild
index e2ad135aa100..39a30f8a82f9 100644
--- a/sys-apps/man/man-1.5i-r3.ebuild
+++ b/sys-apps/man/man-1.5i-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5i-r3.ebuild,v 1.11 2003/05/25 15:10:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5i-r3.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 NV=1.5i2
 S=${WORKDIR}/${PN}-${NV}
@@ -15,7 +15,7 @@ RDEPEND="virtual/glibc
 
 
 SLOT="0"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/man/man-1.5k-r1.ebuild b/sys-apps/man/man-1.5k-r1.ebuild
index 7b0733b6073f..e196da831c66 100644
--- a/sys-apps/man/man-1.5k-r1.ebuild
+++ b/sys-apps/man/man-1.5k-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5k-r1.ebuild,v 1.10 2003/05/25 15:10:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5k-r1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc ~sparc alpha hppa arm mips"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/man/man-1.5l-r3.ebuild b/sys-apps/man/man-1.5l-r3.ebuild
index 6e579f7a00ba..f5297b55b43a 100644
--- a/sys-apps/man/man-1.5l-r3.ebuild
+++ b/sys-apps/man/man-1.5l-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r3.ebuild,v 1.2 2003/05/25 15:10:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r3.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/man/man-1.5l-r4.ebuild b/sys-apps/man/man-1.5l-r4.ebuild
index 548e26ae0590..bf6764cbd61d 100644
--- a/sys-apps/man/man-1.5l-r4.ebuild
+++ b/sys-apps/man/man-1.5l-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r4.ebuild,v 1.1 2003/05/31 08:58:10 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r4.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls"
 
@@ -19,7 +19,7 @@ RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/man/man-1.5l-r5.ebuild b/sys-apps/man/man-1.5l-r5.ebuild
index 12d18b5615c7..be91072663a6 100644
--- a/sys-apps/man/man-1.5l-r5.ebuild
+++ b/sys-apps/man/man-1.5l-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r5.ebuild,v 1.2 2003/06/14 14:44:31 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r5.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls"
 
@@ -19,7 +19,7 @@ RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/man/man-1.5l-r6.ebuild b/sys-apps/man/man-1.5l-r6.ebuild
index 4be8836dcf97..2152ceb23b3b 100644
--- a/sys-apps/man/man-1.5l-r6.ebuild
+++ b/sys-apps/man/man-1.5l-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r6.ebuild,v 1.1 2003/06/10 18:47:58 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r6.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls"
 
@@ -19,7 +19,7 @@ RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/mawk/mawk-1.3.3.ebuild b/sys-apps/mawk/mawk-1.3.3.ebuild
index 9f1c20152a0d..1eb6e5f07332 100644
--- a/sys-apps/mawk/mawk-1.3.3.ebuild
+++ b/sys-apps/mawk/mawk-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/mawk-1.3.3.ebuild,v 1.1 2003/06/08 20:47:22 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/mawk-1.3.3.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="An (often faster than gawk) awk-interpreter."
 SRC_URI="ftp://ftp.whidbey.net/pub/brennan/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="not avail -- use SRC_URI"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa"
 
 DEPEND="virtual/glibc"
 IUSE=""
diff --git a/sys-apps/mdadm/mdadm-1.0.1.ebuild b/sys-apps/mdadm/mdadm-1.0.1.ebuild
index f3cbc3946f0f..3eb8f2548b3e 100644
--- a/sys-apps/mdadm/mdadm-1.0.1.ebuild
+++ b/sys-apps/mdadm/mdadm-1.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.0.1.ebuild,v 1.3 2003/02/13 16:05:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.0.1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="An extremely useful tool for running RAID systems - it can be used as a replacement for the raidtools, or as a supplement."
 HOMEPAGE="http://www.cse.unsw.edu.au/~neilb/source"
 SRC_URI="http://www.cse.unsw.edu.au/~neilb/source/mdadm/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="static"
 DEPEND=""
 RDEPEND=""
diff --git a/sys-apps/mdadm/mdadm-1.2.0.ebuild b/sys-apps/mdadm/mdadm-1.2.0.ebuild
index 2550086c1422..30b44d208b59 100644
--- a/sys-apps/mdadm/mdadm-1.2.0.ebuild
+++ b/sys-apps/mdadm/mdadm-1.2.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.2.0.ebuild,v 1.2 2003/05/09 20:14:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.2.0.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="An extremely useful tool for running RAID systems - it can be used as a replacement for the raidtools, or as a supplement."
 HOMEPAGE="http://www.cse.unsw.edu.au/~neilb/source"
 SRC_URI="http://www.cse.unsw.edu.au/~neilb/source/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="static"
 DEPEND=""
 RDEPEND=""
diff --git a/sys-apps/memtest86/memtest86-3.0-r1.ebuild b/sys-apps/memtest86/memtest86-3.0-r1.ebuild
index 2ea0b5094565..1f77a02b1038 100644
--- a/sys-apps/memtest86/memtest86-3.0-r1.ebuild
+++ b/sys-apps/memtest86/memtest86-3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r1.ebuild,v 1.5 2003/02/13 16:05:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="A stand alone memory test for x86 computers"
 SRC_URI="http://www.memtest86.com/${P}.tar.gz"
 HOMEPAGE="http://www.memtest86.com/"
-KEYWORDS="x86 -ppc -sparc "
+KEYWORDS="x86 amd64 -ppc -sparc "
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.06.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.06.ebuild
index 8071f7ed3b30..2a7f8744d5a4 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.06.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.06.ebuild,v 1.1 2003/02/11 10:38:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.06.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 
 MY_P=${PN/-/_}-${PV}
@@ -13,7 +13,7 @@ SRC_URI="http://www.urbanmyth.org/microcode/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -hppa -mips -alpha"
+KEYWORDS="x86 amd64 -ppc -sparc -hppa -mips -alpha"
 
 DEPEND="virtual/linux-sources"
 
diff --git a/sys-apps/mii-diag/mii-diag-2.07.ebuild b/sys-apps/mii-diag/mii-diag-2.07.ebuild
index 93110fd2e17f..ed7662be7694 100644
--- a/sys-apps/mii-diag/mii-diag-2.07.ebuild
+++ b/sys-apps/mii-diag/mii-diag-2.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.07.ebuild,v 1.2 2003/02/13 16:05:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.07.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 MIIVER=${PV}
 LIBVER=2.04
@@ -13,7 +13,7 @@ SRC_URI="" # ftp://ftp.scyld.com/pub/diag/mii-diag.c
            # ftp://ftp.scyld.com/pub/diag/libmii.c
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 amd64 ~alpha"
 IUSE=""
 DEPEND=""
 
diff --git a/sys-apps/mindi/mindi-0.67.ebuild b/sys-apps/mindi/mindi-0.67.ebuild
index 8053bc687014..a7416aee20bb 100644
--- a/sys-apps/mindi/mindi-0.67.ebuild
+++ b/sys-apps/mindi/mindi-0.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.67.ebuild,v 1.4 2003/02/13 16:05:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.67.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
 HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.microwerks.net/~hugo/download/daily/${P}_20021020.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=sys-apps/bzip2-1.0.1
 	>=app-cdr/cdrtools-1.11
diff --git a/sys-apps/mindi/mindi-0.81.ebuild b/sys-apps/mindi/mindi-0.81.ebuild
index 870d7cb1b248..d11d8d9e572c 100644
--- a/sys-apps/mindi/mindi-0.81.ebuild
+++ b/sys-apps/mindi/mindi-0.81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.81.ebuild,v 1.2 2003/02/13 16:05:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.81.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
 HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=sys-apps/bzip2-1.0.1
 	>=app-cdr/cdrtools-1.11
diff --git a/sys-apps/mindi/mindi-0.85.ebuild b/sys-apps/mindi/mindi-0.85.ebuild
index 73338e82e43c..1e166adb2be6 100644
--- a/sys-apps/mindi/mindi-0.85.ebuild
+++ b/sys-apps/mindi/mindi-0.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.85.ebuild,v 1.1 2003/06/19 08:28:46 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.85.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
 HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=sys-apps/bzip2-1.0.1
 		>=app-cdr/cdrtools-1.11
diff --git a/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild
index 9fe308686068..ce705b1db9a7 100644
--- a/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild,v 1.11 2003/02/13 16:05:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Miscellaneous files"
 SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
index 5c9f10853d8e..35c865df4c82 100644
--- a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.1 2003/03/09 05:36:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/miscfiles/miscfiles-1.3-r2.ebuild b/sys-apps/miscfiles/miscfiles-1.3-r2.ebuild
index e1e401ad7bf9..eb2f0787b1bf 100644
--- a/sys-apps/miscfiles/miscfiles-1.3-r2.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r2.ebuild,v 1.1 2003/06/13 12:44:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r2.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/miscfiles/miscfiles-1.3.ebuild b/sys-apps/miscfiles/miscfiles-1.3.ebuild
index b4e65df2a31f..e86f89a918f1 100644
--- a/sys-apps/miscfiles/miscfiles-1.3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3.ebuild,v 1.11 2003/02/22 02:18:35 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Miscellaneous files"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild b/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild
index c6150bed78a2..c11365e73819 100644
--- a/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild
+++ b/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild,v 1.13 2003/04/17 17:10:40 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 # -r2 by Dan Armak
 
 DESCRIPTION="Premastering program for creating iso9660 volumes"
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/mkisofs.html"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild
index 4660aec8a650..5516275386b5 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild,v 1.3 2003/05/25 15:21:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -23,7 +23,7 @@ DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
 SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="virtual/glibc"
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild
index 75113e0236f2..58ae83684a65 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild,v 1.2 2003/05/25 15:21:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -16,7 +16,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild
index 97408cac8ff4..f2218426775d 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild,v 1.2 2003/05/25 15:21:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -16,7 +16,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild
index eb9a04f9fc4a..c2b430e36da5 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild,v 1.2 2003/06/18 23:29:49 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -16,7 +16,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/modutils/modutils-2.4.16-r2.ebuild b/sys-apps/modutils/modutils-2.4.16-r2.ebuild
index 409aea3d3640..b72995e3b2de 100644
--- a/sys-apps/modutils/modutils-2.4.16-r2.ebuild
+++ b/sys-apps/modutils/modutils-2.4.16-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r2.ebuild,v 1.13 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r2.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
 DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 #	zlib? ( sys-libs/zlib )"
diff --git a/sys-apps/modutils/modutils-2.4.16-r3.ebuild b/sys-apps/modutils/modutils-2.4.16-r3.ebuild
index 875fa2ee9fcf..60b53a0413f6 100644
--- a/sys-apps/modutils/modutils-2.4.16-r3.ebuild
+++ b/sys-apps/modutils/modutils-2.4.16-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r3.ebuild,v 1.13 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r3.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
 DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 #	zlib? ( sys-libs/zlib )"
diff --git a/sys-apps/modutils/modutils-2.4.19.ebuild b/sys-apps/modutils/modutils-2.4.19.ebuild
index 160219551cdc..fa8cd625530b 100644
--- a/sys-apps/modutils/modutils-2.4.19.ebuild
+++ b/sys-apps/modutils/modutils-2.4.19.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.19.ebuild,v 1.12 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.19.ebuild,v 1.13 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
 DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 ppc sparc alpha mips"
+KEYWORDS="x86 amd64 ppc sparc alpha mips"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/modutils/modutils-2.4.20.ebuild b/sys-apps/modutils/modutils-2.4.20.ebuild
index ab7ad83c9e53..3d7a4e21a43e 100644
--- a/sys-apps/modutils/modutils-2.4.20.ebuild
+++ b/sys-apps/modutils/modutils-2.4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.20.ebuild,v 1.6 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.20.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -8,7 +8,7 @@ DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/modutils/modutils-2.4.22.ebuild b/sys-apps/modutils/modutils-2.4.22.ebuild
index 7ea2e5d4c8a9..8956dc5a2686 100644
--- a/sys-apps/modutils/modutils-2.4.22.ebuild
+++ b/sys-apps/modutils/modutils-2.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.22.ebuild,v 1.9 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.22.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 
-KEYWORDS="x86 ppc sparc alpha hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/modutils/modutils-2.4.23.ebuild b/sys-apps/modutils/modutils-2.4.23.ebuild
index b4a865f09b40..38e096a4367c 100644
--- a/sys-apps/modutils/modutils-2.4.23.ebuild
+++ b/sys-apps/modutils/modutils-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.23.ebuild,v 1.4 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.23.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/modutils/modutils-2.4.24.ebuild b/sys-apps/modutils/modutils-2.4.24.ebuild
index c03240b6351d..d998896fc4d6 100644
--- a/sys-apps/modutils/modutils-2.4.24.ebuild
+++ b/sys-apps/modutils/modutils-2.4.24.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.24.ebuild,v 1.8 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.24.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 ppc sparc ~alpha hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ppc sparc ~alpha hppa ~arm ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
diff --git a/sys-apps/modutils/modutils-2.4.25.ebuild b/sys-apps/modutils/modutils-2.4.25.ebuild
index 6226ba0c7892..a89685ef5025 100644
--- a/sys-apps/modutils/modutils-2.4.25.ebuild
+++ b/sys-apps/modutils/modutils-2.4.25.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.7 2003/05/25 14:38:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Standard kernel module utilities"
 SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 ppc sparc ~alpha hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ppc sparc ~alpha hppa ~arm ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
diff --git a/sys-apps/mondo-rescue/mondo-rescue-1.47.ebuild b/sys-apps/mondo-rescue/mondo-rescue-1.47.ebuild
index b91552c7e952..ded3cfa87f32 100644
--- a/sys-apps/mondo-rescue/mondo-rescue-1.47.ebuild
+++ b/sys-apps/mondo-rescue/mondo-rescue-1.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo-rescue/mondo-rescue-1.47.ebuild,v 1.5 2003/02/13 16:06:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo-rescue/mondo-rescue-1.47.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="a nice backup tool"
 SRC_URI="http://www.microwerks.net/~hugo/download/daily/${PN/-rescue/}-${PV}_20021020.tgz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.microwerks.net/~hugo/download.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=app-arch/afio-2.4.7
 	>=sys-apps/mindi-0.67
diff --git a/sys-apps/mondo-rescue/mondo-rescue-1.61.ebuild b/sys-apps/mondo-rescue/mondo-rescue-1.61.ebuild
index 235f0a01d17c..e0c20f0b509a 100644
--- a/sys-apps/mondo-rescue/mondo-rescue-1.61.ebuild
+++ b/sys-apps/mondo-rescue/mondo-rescue-1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo-rescue/mondo-rescue-1.61.ebuild,v 1.2 2003/02/13 16:07:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo-rescue/mondo-rescue-1.61.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="a nice backup tool"
 SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${PN/-rescue/}-${PV}.tgz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.microwerks.net/~hugo/download.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=app-arch/afio-2.4.7
 	>=sys-apps/mindi-0.80
diff --git a/sys-apps/mondo-rescue/mondo-rescue-1.65.ebuild b/sys-apps/mondo-rescue/mondo-rescue-1.65.ebuild
index d7daa8d7dd70..193eacfc6863 100644
--- a/sys-apps/mondo-rescue/mondo-rescue-1.65.ebuild
+++ b/sys-apps/mondo-rescue/mondo-rescue-1.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo-rescue/mondo-rescue-1.65.ebuild,v 1.3 2003/06/21 18:57:14 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo-rescue/mondo-rescue-1.65.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="a nice backup tool"
 SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${PN/-rescue/}-${PV}.tgz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.microwerks.net/~hugo/download.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=app-arch/afio-2.4.7
 	>=sys-apps/mindi-0.80
diff --git a/sys-apps/mondo/mondo-0.6.ebuild b/sys-apps/mondo/mondo-0.6.ebuild
index c2f34acb4c55..6866840be0da 100644
--- a/sys-apps/mondo/mondo-0.6.ebuild
+++ b/sys-apps/mondo/mondo-0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.6.ebuild,v 1.8 2003/05/29 09:15:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.6.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="A System Health Monitor"
 HOMEPAGE="http://mondo-daemon.sourceforge.net/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/mondo/mondo-0.9.ebuild b/sys-apps/mondo/mondo-0.9.ebuild
index b624ced41e29..e47ee91fab9c 100644
--- a/sys-apps/mondo/mondo-0.9.ebuild
+++ b/sys-apps/mondo/mondo-0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.9.ebuild,v 1.3 2003/05/29 09:15:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.9.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="A System Health Monitor"
 HOMEPAGE="http://mondo-daemon.sourceforge.net/"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/most/most-4.9.2.ebuild b/sys-apps/most/most-4.9.2.ebuild
index 2207c6620f39..caafea79f569 100644
--- a/sys-apps/most/most-4.9.2.ebuild
+++ b/sys-apps/most/most-4.9.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.2.ebuild,v 1.11 2003/02/13 16:07:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.2.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An extremely excellent text file reader"
 HOMEPAGE="http://freshmeat.net/projects/most/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 SRC_URI="ftp://space.mit.edu/pub/davis/most/${P}.tar.gz"
diff --git a/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild b/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
index 5cf8f8723393..30ad97722a59 100644
--- a/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
+++ b/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild,v 1.3 2003/02/28 13:18:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Cisco's wireless drivers and utilities"
 
@@ -13,7 +13,7 @@ RESTRICT="fetch"
 LICENSE="MPL-1.1"
 
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 amd64 -ppc -sparc"
 
 IUSE=""
 
diff --git a/sys-apps/mtx/mtx-1.2.17.ebuild b/sys-apps/mtx/mtx-1.2.17.ebuild
index 8a7fe54c1682..1b8e742bcb9b 100644
--- a/sys-apps/mtx/mtx-1.2.17.ebuild
+++ b/sys-apps/mtx/mtx-1.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtx/mtx-1.2.17.ebuild,v 1.5 2003/02/28 13:18:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtx/mtx-1.2.17.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 SRC_URI="mirror://sourceforge/${PN}/${P}rel.tar.gz"
 S=${WORKDIR}/${P}
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 
 src_unpack() {
diff --git a/sys-apps/nbd/nbd-14.ebuild b/sys-apps/nbd/nbd-14.ebuild
index 36e747bd371e..f22d8b3d118d 100644
--- a/sys-apps/nbd/nbd-14.ebuild
+++ b/sys-apps/nbd/nbd-14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-14.ebuild,v 1.11 2003/02/13 16:07:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-14.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P=${P//-/.}
 S=${WORKDIR}/${PN}
@@ -8,7 +8,7 @@ DESCRIPTION="Userland client/server for kernel network block device"
 SRC_URI="http://atrey.karlin.mff.cuni.cz/~pavel/nbd/${MY_P}.tar.gz"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~pavel/nbd/nbd.html"
 
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/nbd/nbd-2.0.ebuild b/sys-apps/nbd/nbd-2.0.ebuild
index 6ee7f0b8153c..64068ca81d03 100644
--- a/sys-apps/nbd/nbd-2.0.ebuild
+++ b/sys-apps/nbd/nbd-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.0.ebuild,v 1.1 2003/04/20 22:54:52 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.0.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sf.net"
@@ -8,7 +8,7 @@ LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
 
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 
 S=${WORKDIR}/${PN}
diff --git a/sys-apps/nbench/nbench-2.1.ebuild b/sys-apps/nbench/nbench-2.1.ebuild
index 53de719ce527..a869ba81e017 100644
--- a/sys-apps/nbench/nbench-2.1.ebuild
+++ b/sys-apps/nbench/nbench-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbench/nbench-2.1.ebuild,v 1.2 2003/02/13 16:07:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbench/nbench-2.1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P="${PN}-byte-${PV}"
 DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html"
 SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz"
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND="virtual/glibc"
diff --git a/sys-apps/net-tools/net-tools-1.60-r6.ebuild b/sys-apps/net-tools/net-tools-1.60-r6.ebuild
index a0fb9bdd674d..a67380571dba 100644
--- a/sys-apps/net-tools/net-tools-1.60-r6.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r6.ebuild,v 1.1 2003/03/18 21:36:25 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r6.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 IUSE="nls build"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/net-tools/net-tools-1.60-r7.ebuild b/sys-apps/net-tools/net-tools-1.60-r7.ebuild
index 4fab4379321a..2a8d801156dc 100644
--- a/sys-apps/net-tools/net-tools-1.60-r7.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r7.ebuild,v 1.2 2003/06/18 22:45:53 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r7.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
 IUSE="nls build static"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
index 7469d8ff64f5..9e61546c3e4f 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild,v 1.19 2003/03/27 07:30:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild,v 1.20 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
index 659e1e01f5f8..668245982476 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild,v 1.8 2003/03/27 07:30:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Standard linux net thingees -- inetd, ping"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa arm mips"
 SLOT="0"
 LICENSE="BSD"
 
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
index 5ffbe738205b..c5f8b58b3dc7 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild,v 1.1 2003/06/19 20:25:24 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 # Only keyword for your arch if you have iputils in your default profile!
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="BSD"
 
diff --git a/sys-apps/nettrom/nettrom-2.3.3.ebuild b/sys-apps/nettrom/nettrom-2.3.3.ebuild
index 1ad86df5b4a6..ef11f08ad25d 100644
--- a/sys-apps/nettrom/nettrom-2.3.3.ebuild
+++ b/sys-apps/nettrom/nettrom-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nettrom/nettrom-2.3.3.ebuild,v 1.1 2003/02/24 02:38:48 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nettrom/nettrom-2.3.3.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="NetWinder ARM bootloader and utilities"
 HOMEPAGE="http://www.netwinder.org/"
@@ -9,7 +9,7 @@ LICENSE="as-is"
 SLOT="0"
 
 # no one but arm wants this package - binaries included
-KEYWORDS="arm -x86 -alpha -ppc -mips -hppa -sparc"
+KEYWORDS="x86 amd64 -alpha -ppc -mips -hppa -sparc"
 
 IUSE=""
 DEPEND="virtual/glibc"
diff --git a/sys-apps/noflushd/noflushd-2.4-r3.ebuild b/sys-apps/noflushd/noflushd-2.4-r3.ebuild
index 80067d251d95..3cf0374fc13a 100644
--- a/sys-apps/noflushd/noflushd-2.4-r3.ebuild
+++ b/sys-apps/noflushd/noflushd-2.4-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r3.ebuild,v 1.8 2003/04/16 17:51:07 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r3.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 # Note: the daemon's current 2.4 version has nothing to do with kernel versions
 
 MY_P="${P/-/_}"
 S=${WORKDIR}/${P}.orig
 SRC_URI="http://download.sourceforge.net/noflushd/${MY_P}.orig.tar.gz"
 HOMEPAGE="http://noflushd.sourceforge.net/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 DESCRIPTION="A daemon to spin down your disks and force accesses to be cached"
diff --git a/sys-apps/noflushd/noflushd-2.4-r6.ebuild b/sys-apps/noflushd/noflushd-2.4-r6.ebuild
index c966cd4d6bf6..a1a35dddc1c4 100644
--- a/sys-apps/noflushd/noflushd-2.4-r6.ebuild
+++ b/sys-apps/noflushd/noflushd-2.4-r6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r6.ebuild,v 1.9 2003/04/16 17:51:07 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r6.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 # Note: the daemon's current 2.4 version has nothing to do with kernel versions
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${P}.orig
 SRC_URI="http://download.sourceforge.net/noflushd/${MY_P}.orig.tar.gz"
 HOMEPAGE="http://noflushd.sourceforge.net"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 DESCRIPTION="A daemon to spin down your disks and force accesses to be cached"
diff --git a/sys-apps/noflushd/noflushd-2.6.3.ebuild b/sys-apps/noflushd/noflushd-2.6.3.ebuild
index eec9b8eda015..5518fe32dafd 100644
--- a/sys-apps/noflushd/noflushd-2.6.3.ebuild
+++ b/sys-apps/noflushd/noflushd-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.6.3.ebuild,v 1.7 2003/02/13 16:08:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.6.3.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 
@@ -8,7 +8,7 @@ DESCRIPTION="A daemon to spin down your disks and force accesses to be cached"
 HOMEPAGE="http://noflushd.sourceforge.net"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/noflushd/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 
 DEPEND="virtual/glibc"
diff --git a/sys-apps/ntfsprogs/ntfsprogs-1.7.1.ebuild b/sys-apps/ntfsprogs/ntfsprogs-1.7.1.ebuild
index 325016b75572..74e323c31437 100644
--- a/sys-apps/ntfsprogs/ntfsprogs-1.7.1.ebuild
+++ b/sys-apps/ntfsprogs/ntfsprogs-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ntfsprogs/ntfsprogs-1.7.1.ebuild,v 1.2 2003/06/10 17:18:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ntfsprogs/ntfsprogs-1.7.1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Utilities and library for accessing NTFS filesystems"
 HOMEPAGE="http://linux-ntfs.sourceforge.net/"
@@ -10,7 +10,7 @@ DEPEND=">=sys-devel/gcc-2.95
 	>=sys-apps/sed-4"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 src_compile() {
 	econf || die "Configure failed"
diff --git a/sys-apps/pam-login/pam-login-3.10.ebuild b/sys-apps/pam-login/pam-login-3.10.ebuild
index 99d1936e11c5..7979e720156e 100644
--- a/sys-apps/pam-login/pam-login-3.10.ebuild
+++ b/sys-apps/pam-login/pam-login-3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.10.ebuild,v 1.6 2003/03/28 16:58:38 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.10.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 # Do we want to backup an old login.defs, and forcefully
 # install a new version?
@@ -12,7 +12,7 @@ DESCRIPTION="Based on the sources from util-linux, with added pam and shadow fea
 SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
 
-KEYWORDS="x86 ~ppc sparc ~alpha ~mips ~hppa arm"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha ~mips ~hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/pam-login/pam-login-3.11.ebuild b/sys-apps/pam-login/pam-login-3.11.ebuild
index 5dd1f4eec7f5..63dc9b0d2eb6 100644
--- a/sys-apps/pam-login/pam-login-3.11.ebuild
+++ b/sys-apps/pam-login/pam-login-3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.11.ebuild,v 1.2 2003/05/20 08:00:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.11.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 
 inherit gnuconfig
@@ -15,7 +15,7 @@ DESCRIPTION="Based on the sources from util-linux, with added pam and shadow fea
 SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/pam-login/pam-login-3.6-r1.ebuild b/sys-apps/pam-login/pam-login-3.6-r1.ebuild
index 09efae97cb5e..05d84e01b41f 100644
--- a/sys-apps/pam-login/pam-login-3.6-r1.ebuild
+++ b/sys-apps/pam-login/pam-login-3.6-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r1.ebuild,v 1.9 2003/02/13 16:08:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r1.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 MY_PN="${PN/pam-/pam_}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Based on the sources from util-linux, with added pam and shadow features"
 SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
diff --git a/sys-apps/pam-login/pam-login-3.6-r2.ebuild b/sys-apps/pam-login/pam-login-3.6-r2.ebuild
index 332d86fe89e6..9ffebecdcd24 100644
--- a/sys-apps/pam-login/pam-login-3.6-r2.ebuild
+++ b/sys-apps/pam-login/pam-login-3.6-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r2.ebuild,v 1.13 2003/02/13 16:08:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r2.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 MY_PN="${PN/pam-/pam_}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Based on the sources from util-linux, with added pam and shadow features"
 SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
diff --git a/sys-apps/pam-login/pam-login-3.7.ebuild b/sys-apps/pam-login/pam-login-3.7.ebuild
index 53213b8b32e3..864d1ffcad67 100644
--- a/sys-apps/pam-login/pam-login-3.7.ebuild
+++ b/sys-apps/pam-login/pam-login-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.7.ebuild,v 1.12 2003/02/13 16:08:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.7.ebuild,v 1.13 2003/06/21 21:19:40 drobbins Exp $
 
 # Do we want to backup an old login.defs, and forcefully
 # install a new version?
@@ -12,7 +12,7 @@ DESCRIPTION="Based on the sources from util-linux, with added pam and shadow fea
 SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/parted/parted-1.6.4.ebuild b/sys-apps/parted/parted-1.6.4.ebuild
index 91734765428d..092334d38b3b 100644
--- a/sys-apps/parted/parted-1.6.4.ebuild
+++ b/sys-apps/parted/parted-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.4.ebuild,v 1.3 2003/02/13 16:08:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.4.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls static readline"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/parted"
-KEYWORDS="x86 ~ppc ~sparc "
+KEYWORDS="x86 amd64 ~ppc ~sparc "
 DEPEND="virtual/glibc
 	>=sys-apps/e2fsprogs-1.27
 	>=sys-libs/ncurses-5.2
diff --git a/sys-apps/parted/parted-1.6.5.ebuild b/sys-apps/parted/parted-1.6.5.ebuild
index 5b4fb0e4e810..40d569a47174 100644
--- a/sys-apps/parted/parted-1.6.5.ebuild
+++ b/sys-apps/parted/parted-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.5.ebuild,v 1.3 2003/03/26 02:44:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.5.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls static readline"
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc hppa"
+KEYWORDS="x86 amd64 ppc sparc hppa"
 
 DEPEND=">=sys-apps/e2fsprogs-1.27
 	>=sys-libs/ncurses-5.2
diff --git a/sys-apps/partimage/partimage-0.6.2.ebuild b/sys-apps/partimage/partimage-0.6.2.ebuild
index 19363af47181..931073403dff 100644
--- a/sys-apps/partimage/partimage-0.6.2.ebuild
+++ b/sys-apps/partimage/partimage-0.6.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/partimage/partimage-0.6.2.ebuild,v 1.5 2003/05/14 22:14:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/partimage/partimage-0.6.2.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
 HOMEPAGE="http://www.partimage.org/"
 SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 IUSE="ssl"
 
 RDEPEND="virtual/glibc
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild
index ce20e979dde1..735ed8f6b363 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild,v 1.11 2003/02/28 13:18:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a PPC-only program to map special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
index 8ce60bc9e782..d329d10bbb8c 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.7 2003/02/28 13:18:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a PPC-only program to map special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
index a142b05103a7..0ef85d97109a 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.5 2003/03/15 03:25:21 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc ~x86 -mips"
+KEYWORDS="x86 amd64 -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild
index 48c4999744dd..b934670f65fe 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild,v 1.5 2003/03/15 03:25:21 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc ~x86 -mips"
+KEYWORDS="x86 amd64 -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.3a.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.3a.ebuild
index fff7f354d448..24593afd82a4 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.3a.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.3a.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.3a.ebuild,v 1.2 2003/05/08 19:51:53 heim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.3a.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="~ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT=0
diff --git a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
index afc5a2ab6f64..b4e885590d8e 100644
--- a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.10 2003/04/04 01:22:20 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm"
 
 DEPEND="virtual/glibc
 	net-misc/wget"
diff --git a/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.3.ebuild b/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.3.ebuild
index bb6cf15c853e..560ddedce187 100644
--- a/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.3.ebuild
+++ b/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.3.ebuild,v 1.4 2003/06/11 01:41:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.3.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 P=${P/-drivers/}
 S=${WORKDIR}/${P}
@@ -15,7 +15,7 @@ RDEPEND=""
 SLOT="0"
 IUSE="trusted apm pnp nocardbus build"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.4.ebuild b/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.4.ebuild
index 32475adfd0f4..63254e4d109d 100644
--- a/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.4.ebuild
+++ b/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.4.ebuild,v 1.2 2003/06/11 01:41:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-drivers/pcmcia-cs-drivers-3.2.4.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ RDEPEND=""
 SLOT="0"
 IUSE="trusted apm pnp nocardbus build"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.3.ebuild b/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.3.ebuild
index e515631b86aa..c5aeac1baf2f 100644
--- a/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.3.ebuild
+++ b/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.3.ebuild,v 1.4 2003/06/11 01:26:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.3.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 P=${P/-tools/}
 S=${WORKDIR}/${P}
@@ -16,7 +16,7 @@ RDEPEND=""
 SLOT="0"
 IUSE="trusted apm pnp nocardbus build gtk X"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.4.ebuild b/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.4.ebuild
index e4999a5208ee..287e208ae69a 100644
--- a/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.4.ebuild
+++ b/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.4.ebuild,v 1.2 2003/06/11 01:26:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-tools/pcmcia-cs-tools-3.2.4.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 P=${P/-tools/}
 S=${WORKDIR}/${P}
@@ -16,7 +16,7 @@ RDEPEND=""
 SLOT="0"
 IUSE="trusted apm pnp nocardbus build gtk X"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild
index f70e84154e03..0239f80bbd95 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild,v 1.9 2003/02/13 16:09:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -11,7 +11,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild
index 64debf015052..34d06358aeba 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild,v 1.4 2003/02/13 16:09:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -12,7 +12,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild
index 5a60fb7bf269..10e43689b354 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild,v 1.4 2003/02/13 16:10:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -12,7 +12,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild
index 47d111ad2b24..7983af216050 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild,v 1.4 2003/02/13 16:10:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -13,7 +13,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild
index 71905402f34a..9657ea324572 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild,v 1.2 2003/02/13 16:10:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 NOCO_VERSION="0.11b"
 
@@ -16,7 +16,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild
index 4dbb250f5dba..29f4b4214b3c 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild,v 1.6 2003/03/07 14:01:32 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 NOCO_VERSION="0.13b"
 
@@ -16,7 +16,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild
index c70fe5bf6ddd..25f79ec40a01 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild,v 1.4 2003/02/13 16:10:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -12,7 +12,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild
index fa71f18d9a3c..b9ac2d8030ac 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild,v 1.3 2003/02/13 16:10:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -13,7 +13,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild
index d0b82e695a98..45e954b00d59 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild,v 1.2 2003/02/13 16:10:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 # Hack for monitor patch
 OLD_NOCO_VERSION="0.11b"
@@ -20,7 +20,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild
index 792590b38fcc..74e3228b4288 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild,v 1.4 2003/03/05 17:53:34 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild
index fa27b015f789..080ed904c46b 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild,v 1.3 2003/02/13 16:10:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -13,7 +13,7 @@ RDEPEND=""
 SLOT="0"
 IUSE="trusted apm pnp nocardbus build"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild
index 9183b6d5d730..481aeb0ab873 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild,v 1.3 2003/04/14 19:39:20 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 # check arch for configure
 if [ ${ARCH} = "x86" ] ; then
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.1.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.1.1.ebuild
index 625956834ba8..faa0717cac73 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.1.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.1.1.ebuild,v 1.3 2003/04/24 10:57:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.1.1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.linuxnet.com/middle.html"
 SRC_URI="http://www.linuxnet.com/middleware/files/${P}.tar.gz"
 
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 
 DEPEND="sys-devel/make
diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild
index bfe3d0e99ebb..ba604a21036b 100644
--- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild
+++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild,v 1.2 2003/02/13 16:10:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P="slb_rf72"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Schlumberger Reflex 72 Serial Smartcard Reader"
 HOMEPAGE="http://www.linuxnet.com/sourcedrivers.html"
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 SRC_URI="http://www.linuxnet.com/drivers/readers/files/slb_rf72-drv-1.1.0.tar.gz"
 DEPEND=">=sys-devel/gcc-2.95.3-r5
diff --git a/sys-apps/pmud/pmud-0.10.1-r1.ebuild b/sys-apps/pmud/pmud-0.10.1-r1.ebuild
index 824055cc4584..9ce7bbe4cc41 100644
--- a/sys-apps/pmud/pmud-0.10.1-r1.ebuild
+++ b/sys-apps/pmud/pmud-0.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmud/pmud-0.10.1-r1.ebuild,v 1.11 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmud/pmud-0.10.1-r1.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="X"
 
@@ -9,7 +9,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="PowerMac power management utilities"
 SRC_URI="http://linuxppc.jvc.nl/${P}.tar.gz"
 HOMEPAGE="http://penguinppc.org/"
-KEYWORDS="ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="sys-kernel/linux-headers
diff --git a/sys-apps/pmud/pmud-0.10.1-r2.ebuild b/sys-apps/pmud/pmud-0.10.1-r2.ebuild
index 9ab348061aa5..95cfbe13c26b 100644
--- a/sys-apps/pmud/pmud-0.10.1-r2.ebuild
+++ b/sys-apps/pmud/pmud-0.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmud/pmud-0.10.1-r2.ebuild,v 1.13 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmud/pmud-0.10.1-r2.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="X"
 
@@ -9,7 +9,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="PowerMac power management utilities"
 SRC_URI="http://linuxppc.jvc.nl/${P}.tar.gz"
 HOMEPAGE="http://penguinppc.org/"
-KEYWORDS="ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="sys-kernel/linux-headers
diff --git a/sys-apps/portage/portage-2.0.47-r10.ebuild b/sys-apps/portage/portage-2.0.47-r10.ebuild
index 9c7fddee1a7a..501ee022b520 100644
--- a/sys-apps/portage/portage-2.0.47-r10.ebuild
+++ b/sys-apps/portage/portage-2.0.47-r10.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r10.ebuild,v 1.9 2003/04/29 15:57:26 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r10.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="build"
 
@@ -12,8 +12,8 @@ SLOT="0"
 DESCRIPTION="Portage ports system"
 SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org"
-KEYWORDS="alpha arm hppa mips ppc sparc x86"
-#KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="x86 amd64"
+#KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
diff --git a/sys-apps/portage/portage-2.0.48-r1.ebuild b/sys-apps/portage/portage-2.0.48-r1.ebuild
index e3f1d5af263c..17b467edd1b4 100644
--- a/sys-apps/portage/portage-2.0.48-r1.ebuild
+++ b/sys-apps/portage/portage-2.0.48-r1.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r1.ebuild,v 1.5 2003/06/05 17:07:36 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="build"
 
@@ -12,8 +12,8 @@ SLOT="0"
 DESCRIPTION="Portage ports system"
 SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org"
-KEYWORDS="alpha arm hppa mips ppc sparc x86"
-#KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="x86 amd64"
+#KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
diff --git a/sys-apps/portage/portage-2.0.48.ebuild b/sys-apps/portage/portage-2.0.48.ebuild
index 6d938b047960..a2b2112e0351 100644
--- a/sys-apps/portage/portage-2.0.48.ebuild
+++ b/sys-apps/portage/portage-2.0.48.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48.ebuild,v 1.6 2003/06/01 08:23:07 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="build"
 
@@ -12,8 +12,8 @@ SLOT="0"
 DESCRIPTION="Portage ports system"
 SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org"
-KEYWORDS="alpha arm hppa mips ppc sparc x86"
-#KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="x86 amd64"
+#KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
diff --git a/sys-apps/portage/portage-2.0.48_pre6.ebuild b/sys-apps/portage/portage-2.0.48_pre6.ebuild
index 8bc38fef120e..ea601aec983a 100644
--- a/sys-apps/portage/portage-2.0.48_pre6.ebuild
+++ b/sys-apps/portage/portage-2.0.48_pre6.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48_pre6.ebuild,v 1.2 2003/05/12 19:14:39 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48_pre6.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="build"
 
@@ -12,8 +12,8 @@ SLOT="0"
 DESCRIPTION="Portage ports system"
 SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org"
-#KEYWORDS="alpha arm hppa mips ppc sparc x86"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+#KEYWORDS="x86 amd64"
+KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
diff --git a/sys-apps/powerbook-tools/powerbook-tools-0.1.ebuild b/sys-apps/powerbook-tools/powerbook-tools-0.1.ebuild
index 6cb909cdd18b..01bdbcd88c73 100644
--- a/sys-apps/powerbook-tools/powerbook-tools-0.1.ebuild
+++ b/sys-apps/powerbook-tools/powerbook-tools-0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerbook-tools/powerbook-tools-0.1.ebuild,v 1.5 2003/03/12 18:06:40 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerbook-tools/powerbook-tools-0.1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
-KEYWORDS="ppc -mips -x86 -alpha -sparc -arm"
+KEYWORDS="x86 amd64 -alpha -sparc -arm"
 DESCRIPTION="A metapackage to install all the packages needed for good powerbook support"
 RDEPEND="sys-apps/pbbuttonsd
 	 sys-apps/gtkpbbuttons
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild
index 7527e5b7eb35..feaea91af7a8 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild,v 1.1 2003/03/12 18:28:30 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DEBRV=7
@@ -9,7 +9,7 @@ DESCRIPTION="PowerPC utils; nvsetenv"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}.orig.tar.gz
 	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}-${DEBRV}.diff.gz"
 HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
-KEYWORDS="ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT="0"
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild
index 7db479545c74..38f3fafaa5c7 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild,v 1.11 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DEBRV=3
@@ -8,7 +8,7 @@ DESCRIPTION="PowerPC utils; nvsetenv"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_${PV}.orig.tar.gz
 	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_${PV}-${DEBRV}.diff.gz"
 HOMEPAGE=""
-KEYWORDS="ppc -x86 -sparc -mips"
+KEYWORDS="x86 amd64 -sparc -mips"
 DEPEND="virtual/glibc"
 RDEPEND=""
 SLOT="0"
diff --git a/sys-apps/powerprefs/powerprefs-0.2.1.ebuild b/sys-apps/powerprefs/powerprefs-0.2.1.ebuild
index 9f243743d7e3..f7be167b8178 100644
--- a/sys-apps/powerprefs/powerprefs-0.2.1.ebuild
+++ b/sys-apps/powerprefs/powerprefs-0.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.2.1.ebuild,v 1.10 2003/02/28 13:18:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.2.1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="powerprefs is a PPC-only program to interface with special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -sparc "
+KEYWORDS="x86 amd64 -sparc "
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="x11-libs/gtk+"
diff --git a/sys-apps/powerprefs/powerprefs-0.2.ebuild b/sys-apps/powerprefs/powerprefs-0.2.ebuild
index e34050c4a4a2..b913156f4746 100644
--- a/sys-apps/powerprefs/powerprefs-0.2.ebuild
+++ b/sys-apps/powerprefs/powerprefs-0.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.2.ebuild,v 1.11 2003/02/13 16:12:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.2.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="powerprefs is a PPC-only program to interface with special Powerbook/iBook keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -sparc "
+KEYWORDS="x86 amd64 -sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/powerprefs/powerprefs-0.3.1.ebuild b/sys-apps/powerprefs/powerprefs-0.3.1.ebuild
index e21af852dbef..00c06e6e3409 100644
--- a/sys-apps/powerprefs/powerprefs-0.3.1.ebuild
+++ b/sys-apps/powerprefs/powerprefs-0.3.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.3.1.ebuild,v 1.5 2003/04/30 20:56:00 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.3.1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
 SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc ~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/procps/procps-2.0.10-r1.ebuild b/sys-apps/procps/procps-2.0.10-r1.ebuild
index 7c4793d1e7ed..665ad15e54e8 100644
--- a/sys-apps/procps/procps-2.0.10-r1.ebuild
+++ b/sys-apps/procps/procps-2.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.10-r1.ebuild,v 1.10 2003/02/10 09:17:22 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.10-r1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://surriel.com/procps/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 
diff --git a/sys-apps/procps/procps-2.0.11.ebuild b/sys-apps/procps/procps-2.0.11.ebuild
index 067b3f2552e5..1a60a70276ab 100644
--- a/sys-apps/procps/procps-2.0.11.ebuild
+++ b/sys-apps/procps/procps-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.11.ebuild,v 1.4 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.11.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools"
@@ -9,7 +9,7 @@ HOMEPAGE="http://surriel.com/procps/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa mips"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/procps/procps-3.1.8.ebuild b/sys-apps/procps/procps-3.1.8.ebuild
index fe2c0640fcfd..83b033de4279 100644
--- a/sys-apps/procps/procps-3.1.8.ebuild
+++ b/sys-apps/procps/procps-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.8.ebuild,v 1.5 2003/06/08 17:24:16 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.8.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="selinux"
 
@@ -16,7 +16,7 @@ replace-flags "-O3" "-O2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa arm ~mips"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha ~hppa arm ~mips"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/procps/procps-3.1.9.ebuild b/sys-apps/procps/procps-3.1.9.ebuild
index 09f9ef85584a..b4c0d2b67b05 100644
--- a/sys-apps/procps/procps-3.1.9.ebuild
+++ b/sys-apps/procps/procps-3.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.9.ebuild,v 1.2 2003/06/08 17:24:16 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.9.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="selinux"
 
@@ -16,7 +16,7 @@ replace-flags "-O3" "-O2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/psmisc/psmisc-21.2-r1.ebuild b/sys-apps/psmisc/psmisc-21.2-r1.ebuild
index 1b0b33f5813b..7030b61cee90 100644
--- a/sys-apps/psmisc/psmisc-21.2-r1.ebuild
+++ b/sys-apps/psmisc/psmisc-21.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r1.ebuild,v 1.2 2003/03/25 17:16:33 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls selinux"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
     selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
diff --git a/sys-apps/psmisc/psmisc-21.2-r2.ebuild b/sys-apps/psmisc/psmisc-21.2-r2.ebuild
index 99fa36c952ae..ed8f88c4101a 100644
--- a/sys-apps/psmisc/psmisc-21.2-r2.ebuild
+++ b/sys-apps/psmisc/psmisc-21.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r2.ebuild,v 1.1 2003/05/18 23:36:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r2.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls selinux"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
     selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
diff --git a/sys-apps/quik/quik-2.0.1.0-r1.ebuild b/sys-apps/quik/quik-2.0.1.0-r1.ebuild
index 4536d0456f46..e063bc3b5190 100644
--- a/sys-apps/quik/quik-2.0.1.0-r1.ebuild
+++ b/sys-apps/quik/quik-2.0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r1.ebuild,v 1.13 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r1.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot
 
@@ -14,7 +14,7 @@ SRC_URI="${DEB_URI}/${MY_P} ${DEB_URI}/${DEB_P}.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -alpha -sparc -mips"
+KEYWORDS="x86 amd64 -alpha -sparc -mips"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/quik/quik-2.0.1.0-r2.ebuild b/sys-apps/quik/quik-2.0.1.0-r2.ebuild
index 99666e602226..2f1792def779 100644
--- a/sys-apps/quik/quik-2.0.1.0-r2.ebuild
+++ b/sys-apps/quik/quik-2.0.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r2.ebuild,v 1.3 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r2.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot
 
@@ -14,7 +14,7 @@ SRC_URI="${DEB_URI}/${MY_P} ${DEB_URI}/${DEB_P}.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -alpha -sparc -mips"
+KEYWORDS="x86 amd64 -alpha -sparc -mips"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/quik/quik-2.0.1.0-r3.ebuild b/sys-apps/quik/quik-2.0.1.0-r3.ebuild
index ad6f01944097..5d60494c8199 100644
--- a/sys-apps/quik/quik-2.0.1.0-r3.ebuild
+++ b/sys-apps/quik/quik-2.0.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r3.ebuild,v 1.3 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r3.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot
 
@@ -14,7 +14,7 @@ SRC_URI="${DEB_URI}/${MY_P} ${DEB_URI}/${DEB_P}.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -alpha -sparc -mips"
+KEYWORDS="x86 amd64 -alpha -sparc -mips"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/quik/quik-2.0.1k.ebuild b/sys-apps/quik/quik-2.0.1k.ebuild
index f976ff9d6ccf..6b76784a80ef 100644
--- a/sys-apps/quik/quik-2.0.1k.ebuild
+++ b/sys-apps/quik/quik-2.0.1k.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1k.ebuild,v 1.1 2003/06/10 21:48:11 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1k.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit mount-boot
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.xs4all.nl/~eddieb/linuxppc/YDL3/quik-${MY_PV}.src.rpm"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -alpha -sparc -mips"
+KEYWORDS="x86 amd64 -alpha -sparc -mips"
 
 DEPEND="virtual/glibc
         app-arch/rpm2targz"
diff --git a/sys-apps/quota/quota-3.06-r1.ebuild b/sys-apps/quota/quota-3.06-r1.ebuild
index b1d96675d504..6c3ed9b7234c 100644
--- a/sys-apps/quota/quota-3.06-r1.ebuild
+++ b/sys-apps/quota/quota-3.06-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r1.ebuild,v 1.3 2003/02/13 16:12:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06-r1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="x86 amd64 ~ppc ~sparc "
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/quota/quota-3.06.ebuild b/sys-apps/quota/quota-3.06.ebuild
index 87b78681f93d..21898bada9ee 100644
--- a/sys-apps/quota/quota-3.06.ebuild
+++ b/sys-apps/quota/quota-3.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.7 2003/02/13 16:12:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
@@ -9,7 +9,7 @@ HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/raidtools/raidtools-0.90-r2.ebuild b/sys-apps/raidtools/raidtools-0.90-r2.ebuild
index a3c5c498b338..6862e06b0ab8 100644
--- a/sys-apps/raidtools/raidtools-0.90-r2.ebuild
+++ b/sys-apps/raidtools/raidtools-0.90-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-0.90-r2.ebuild,v 1.15 2003/02/13 16:12:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-0.90-r2.ebuild,v 1.16 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/raidtools-0.90
 DESCRIPTION="Linux RAID 0/1/4/5 utilities"
 SRC_URI="http://people.redhat.com/mingo/raid-patches/raidtools-dangerous-0.90-20000116.tar.gz"
 DEPEND="virtual/glibc"
 HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/raidtools/raidtools-1.00.3-r1.ebuild b/sys-apps/raidtools/raidtools-1.00.3-r1.ebuild
index 0e16d9752f16..76a8c08c4ddd 100644
--- a/sys-apps/raidtools/raidtools-1.00.3-r1.ebuild
+++ b/sys-apps/raidtools/raidtools-1.00.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-1.00.3-r1.ebuild,v 1.2 2003/03/25 16:06:38 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-1.00.3-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Linux RAID 0/1/4/5 utilities"
 SRC_URI="http://people.redhat.com/mingo/raidtools/${P}.tar.gz"
 HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/raidtools/raidtools-1.00.3.ebuild b/sys-apps/raidtools/raidtools-1.00.3.ebuild
index c733bbd21664..6cae7360a306 100644
--- a/sys-apps/raidtools/raidtools-1.00.3.ebuild
+++ b/sys-apps/raidtools/raidtools-1.00.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-1.00.3.ebuild,v 1.1 2003/02/16 08:05:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-1.00.3.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Linux RAID 0/1/4/5 utilities"
 SRC_URI="http://people.redhat.com/mingo/raidtools/${P}.tar.gz"
 HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/reiserfsprogs/reiserfsprogs-3.6.3.ebuild b/sys-apps/reiserfsprogs/reiserfsprogs-3.6.3.ebuild
index 848206aef66c..e22647e213af 100644
--- a/sys-apps/reiserfsprogs/reiserfsprogs-3.6.3.ebuild
+++ b/sys-apps/reiserfsprogs/reiserfsprogs-3.6.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/reiserfsprogs/reiserfsprogs-3.6.3.ebuild,v 1.7 2003/04/25 19:15:18 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/reiserfsprogs/reiserfsprogs-3.6.3.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Reiserfs Utilities"
 SRC_URI="http://www.namesys.com/pub/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.namesys.com"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/reiserfsprogs/reiserfsprogs-3.6.4-r1.ebuild b/sys-apps/reiserfsprogs/reiserfsprogs-3.6.4-r1.ebuild
index 65d96b05f12a..035badbf44b7 100644
--- a/sys-apps/reiserfsprogs/reiserfsprogs-3.6.4-r1.ebuild
+++ b/sys-apps/reiserfsprogs/reiserfsprogs-3.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/reiserfsprogs/reiserfsprogs-3.6.4-r1.ebuild,v 1.9 2003/05/04 04:12:25 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/reiserfsprogs/reiserfsprogs-3.6.4-r1.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.namesys.com"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha"
+KEYWORDS="x86 amd64 ppc ~sparc ~alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/reiserfsprogs/reiserfsprogs-3.6.8.ebuild b/sys-apps/reiserfsprogs/reiserfsprogs-3.6.8.ebuild
index 85d27c1e45cc..f0e0926444fd 100644
--- a/sys-apps/reiserfsprogs/reiserfsprogs-3.6.8.ebuild
+++ b/sys-apps/reiserfsprogs/reiserfsprogs-3.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/reiserfsprogs/reiserfsprogs-3.6.8.ebuild,v 1.3 2003/06/02 06:32:31 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/reiserfsprogs/reiserfsprogs-3.6.8.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.namesys.com"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha"
+KEYWORDS="x86 amd64 ~ppc ~sparc alpha"
 
 src_compile() {
 	./configure --prefix=/ || die "Failed to configure"
diff --git a/sys-apps/ren/ren-1.0.ebuild b/sys-apps/ren/ren-1.0.ebuild
index ac4a2afd5a9c..4213949bc848 100644
--- a/sys-apps/ren/ren-1.0.ebuild
+++ b/sys-apps/ren/ren-1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ren/ren-1.0.ebuild,v 1.7 2003/02/13 16:13:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ren/ren-1.0.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Renames multiple files"
 HOMEPAGE="http://freshmeat.net/projects/ren"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/reoback/reoback-1.0-r3.ebuild b/sys-apps/reoback/reoback-1.0-r3.ebuild
index 2acb74ac2193..30137cba57ff 100644
--- a/sys-apps/reoback/reoback-1.0-r3.ebuild
+++ b/sys-apps/reoback/reoback-1.0-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/reoback/reoback-1.0-r3.ebuild,v 1.2 2003/06/12 22:10:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/reoback/reoback-1.0-r3.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Reoback Backup Solution"
 SRC_URI="http://switch.dl.sourceforge.net/sourceforge/reoback/reoback-1.0_r3.tar.gz"
 HOMEPAGE="http://reoback.penguinsoup.org/"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 
 RDEPEND=">=sys-apps/tar-1.13 
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.1.ebuild
index cf6aef933c7c..8999b97f49db 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.1.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.1.ebuild,v 1.3 2003/02/11 12:10:33 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.1.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="ncurses"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.rsbac.org/code/rsbac-admin-v${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 DEPEND="sys-kernel/rsbac-sources
 	dev-util/dialog"
diff --git a/sys-apps/s3switch/s3switch-19990826.ebuild b/sys-apps/s3switch/s3switch-19990826.ebuild
index c01a0a0d1c02..ee59814a2ec8 100644
--- a/sys-apps/s3switch/s3switch-19990826.ebuild
+++ b/sys-apps/s3switch/s3switch-19990826.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/s3switch-19990826.ebuild,v 1.8 2003/02/13 16:13:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/s3switch-19990826.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="S3 video chipset output selection utility"
 HOMEPAGE="http://www.probo.com/timr/savage40.html"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/sal-client/sal-client-1.0_rc3.ebuild b/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
index 7d8d6ecbb64c..68300783a3f8 100644
--- a/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
+++ b/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/sal-client-1.0_rc3.ebuild,v 1.3 2003/06/08 21:39:44 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/sal-client-1.0_rc3.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P=${P/_/-}
 
@@ -11,7 +11,7 @@ SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/secureaudit/${MY_P/rc3/RC3
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND="virtual/glibc \
diff --git a/sys-apps/schedutils/schedutils-1.1.0.ebuild b/sys-apps/schedutils/schedutils-1.1.0.ebuild
index 956e8f099886..cb285a4d3988 100644
--- a/sys-apps/schedutils/schedutils-1.1.0.ebuild
+++ b/sys-apps/schedutils/schedutils-1.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/schedutils/schedutils-1.1.0.ebuild,v 1.6 2003/06/10 17:24:35 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/schedutils/schedutils-1.1.0.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Utilities for manipulating kernel schedular parameters"
 HOMEPAGE="http://tech9.net/rml/schedutils"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 LICENSE="GPL-2"
 
 RDEPEND="virtual/glibc"
diff --git a/sys-apps/sed/sed-4.0.5-r1.ebuild b/sys-apps/sed/sed-4.0.5-r1.ebuild
index 58de1d0efec8..458407b396df 100644
--- a/sys-apps/sed/sed-4.0.5-r1.ebuild
+++ b/sys-apps/sed/sed-4.0.5-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.5-r1.ebuild,v 1.5 2003/05/05 19:39:33 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.5-r1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Super-useful stream editor"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/sed/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~arm mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha hppa ~arm mips"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="nls static build"
diff --git a/sys-apps/sed/sed-4.0.5.ebuild b/sys-apps/sed/sed-4.0.5.ebuild
index d383d4341ea9..3f5edb0271c4 100644
--- a/sys-apps/sed/sed-4.0.5.ebuild
+++ b/sys-apps/sed/sed-4.0.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.5.ebuild,v 1.8 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.5.ebuild,v 1.9 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Super-useful stream editor"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/sed/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
 
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="nls static build"
diff --git a/sys-apps/sed/sed-4.0.6.ebuild b/sys-apps/sed/sed-4.0.6.ebuild
index 82bdc5e8d139..6446f1b2eb19 100644
--- a/sys-apps/sed/sed-4.0.6.ebuild
+++ b/sys-apps/sed/sed-4.0.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.6.ebuild,v 1.6 2003/04/02 20:28:31 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.6.ebuild,v 1.7 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Super-useful stream editor"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/sed/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
 
-KEYWORDS="x86 ppc sparc ~alpha hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ppc sparc ~alpha hppa ~arm ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="nls static build"
diff --git a/sys-apps/sed/sed-4.0.7.ebuild b/sys-apps/sed/sed-4.0.7.ebuild
index d5dfa2de682d..c3b2aefe47d8 100644
--- a/sys-apps/sed/sed-4.0.7.ebuild
+++ b/sys-apps/sed/sed-4.0.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.7.ebuild,v 1.4 2003/04/26 16:29:41 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.7.ebuild,v 1.5 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="Super-useful stream editor"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/sed/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
 
-KEYWORDS="x86 ~ppc sparc alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc sparc alpha ~hppa ~arm ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="nls static build"
diff --git a/sys-apps/selinux-base-policy/selinux-base-policy-20030604.ebuild b/sys-apps/selinux-base-policy/selinux-base-policy-20030604.ebuild
index 187ce0628387..d534dd4f9ff2 100644
--- a/sys-apps/selinux-base-policy/selinux-base-policy-20030604.ebuild
+++ b/sys-apps/selinux-base-policy/selinux-base-policy-20030604.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-base-policy/selinux-base-policy-20030604.ebuild,v 1.2 2003/06/07 04:04:35 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-base-policy/selinux-base-policy-20030604.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="selinux"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 RDEPEND="|| (
 		>=sys-kernel/selinux-sources-2.4.20-r1
 		>=sys-kernel/hardened-sources-2.4.20-r1
diff --git a/sys-apps/selinux-small/selinux-small-2003040709-r3.ebuild b/sys-apps/selinux-small/selinux-small-2003040709-r3.ebuild
index 102a75dc89b7..7769ba5c44af 100644
--- a/sys-apps/selinux-small/selinux-small-2003040709-r3.ebuild
+++ b/sys-apps/selinux-small/selinux-small-2003040709-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003040709-r3.ebuild,v 1.2 2003/06/07 20:34:13 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003040709-r3.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="SELinux libraries and policy compiler"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -14,7 +14,7 @@ S="${WORKDIR}/selinux"
 # to easily specify that libsecure is in the workdir, and we want to use pam
 LIBSECURE="-I${S}/libsecure/include -L${S}/libsecure/src -DUSE_PAM"
 
-KEYWORDS="x86 ppc alpha sparc"
+KEYWORDS="x86 amd64 ppc alpha sparc"
 IUSE="selinux"
 DEPEND="<sys-libs/glibc-2.3.2
 	sys-devel/flex
diff --git a/sys-apps/selinux-small/selinux-small-2003040709-r4.ebuild b/sys-apps/selinux-small/selinux-small-2003040709-r4.ebuild
index 0952d069fd08..e5f02692e922 100644
--- a/sys-apps/selinux-small/selinux-small-2003040709-r4.ebuild
+++ b/sys-apps/selinux-small/selinux-small-2003040709-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003040709-r4.ebuild,v 1.2 2003/06/13 22:30:17 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003040709-r4.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 DESCRIPTION="SELinux libraries and policy compiler"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/selinux"
 
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 amd64 ~ppc ~alpha ~sparc"
 IUSE="selinux static"
 DEPEND="sys-devel/flex
 	sys-libs/pam
diff --git a/sys-apps/setserial/setserial-2.17-r2.ebuild b/sys-apps/setserial/setserial-2.17-r2.ebuild
index 8274fc64b98f..efc94a754902 100644
--- a/sys-apps/setserial/setserial-2.17-r2.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r2.ebuild,v 1.15 2003/02/13 16:13:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r2.ebuild,v 1.16 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Configure your serial ports with it"
 SRC_URI="ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz
 	 ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz"
 HOMEPAGE="http://setserial.sourceforge.net/"
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild b/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild
index 00631d4dd3c8..ba216f3e4f29 100644
--- a/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild,v 1.10 2003/02/13 16:14:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Your standard GNU shell utilities"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86  ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
diff --git a/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild b/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
index 85a40f961898..794a0a594dd5 100644
--- a/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild,v 1.11 2003/02/13 16:14:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -14,7 +14,7 @@ RDEPEND="virtual/glibc"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86  ppc sparc alpha"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/shadow/shadow-4.0.3-r3.ebuild b/sys-apps/shadow/shadow-4.0.3-r3.ebuild
index 9d6cee5dd6e1..dc9b1362bd78 100644
--- a/sys-apps/shadow/shadow-4.0.3-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r3.ebuild,v 1.9 2003/03/25 06:02:52 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r3.ebuild,v 1.10 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="selinux"
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND=">=sys-libs/pam-0.75-r4
 	>=sys-libs/cracklib-2.7-r3
diff --git a/sys-apps/shadow/shadow-4.0.3-r4.ebuild b/sys-apps/shadow/shadow-4.0.3-r4.ebuild
index 9f65562a6101..272f4ddcae17 100644
--- a/sys-apps/shadow/shadow-4.0.3-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r4.ebuild,v 1.2 2003/02/24 14:24:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r4.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND=">=sys-libs/pam-0.75-r4
 	>=sys-libs/cracklib-2.7-r3
diff --git a/sys-apps/shadow/shadow-4.0.3-r5.ebuild b/sys-apps/shadow/shadow-4.0.3-r5.ebuild
index 5e16091ecf78..2973dd4f3f35 100644
--- a/sys-apps/shadow/shadow-4.0.3-r5.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r5.ebuild,v 1.2 2003/05/14 16:17:31 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r5.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND=">=sys-libs/pam-0.75-r4
 	>=sys-libs/cracklib-2.7-r3
diff --git a/sys-apps/shadow/shadow-4.0.3-r6.ebuild b/sys-apps/shadow/shadow-4.0.3-r6.ebuild
index cde958a724a5..0ad55f01e7eb 100644
--- a/sys-apps/shadow/shadow-4.0.3-r6.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r6.ebuild,v 1.1 2003/05/18 12:54:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r6.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 IUSE="selinux"
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND=">=sys-libs/pam-0.75-r4
 	>=sys-libs/cracklib-2.7-r3
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild
index cc15b5cae58d..730aa84509ed 100644
--- a/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild
+++ b/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild,v 1.7 2003/03/11 06:25:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild,v 1.8 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm"
 
 DEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
diff --git a/sys-apps/silo/silo-1.2.5.ebuild b/sys-apps/silo/silo-1.2.5.ebuild
index 4069fbabe003..74329d7fd9e9 100644
--- a/sys-apps/silo/silo-1.2.5.ebuild
+++ b/sys-apps/silo/silo-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/silo/silo-1.2.5.ebuild,v 1.13 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/silo/silo-1.2.5.ebuild,v 1.14 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
@@ -9,7 +9,7 @@ HOMEPAGE="http://freshmeat.net/projects/silo/index.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc -x86 -ppc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -alpha -mips"
 
 PROVIDE="virtual/bootloader"
 
diff --git a/sys-apps/silo/silo-1.2.6.ebuild b/sys-apps/silo/silo-1.2.6.ebuild
index 814406e2b713..abbb052d723c 100644
--- a/sys-apps/silo/silo-1.2.6.ebuild
+++ b/sys-apps/silo/silo-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/silo/silo-1.2.6.ebuild,v 1.10 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/silo/silo-1.2.6.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
@@ -9,7 +9,7 @@ HOMEPAGE="http://freshmeat.net/projects/silo/index.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc -x86 -ppc -alpha -mips"
+KEYWORDS="x86 amd64 -ppc -alpha -mips"
 
 PROVIDE="virtual/bootloader"
 
diff --git a/sys-apps/slocate/slocate-2.7-r2.ebuild b/sys-apps/slocate/slocate-2.7-r2.ebuild
index cba64b2159c8..32e80c1bcfd9 100644
--- a/sys-apps/slocate/slocate-2.7-r2.ebuild
+++ b/sys-apps/slocate/slocate-2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r2.ebuild,v 1.5 2003/06/05 23:03:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r2.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure locate provides a secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.geekreview.org/slocate/src/slocate-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ~mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa ~mips"
 
 DEPEND="sys-apps/shadow
 	>=sys-apps/sed-4"
diff --git a/sys-apps/smartmontools/smartmontools-5.0.45.ebuild b/sys-apps/smartmontools/smartmontools-5.0.45.ebuild
index 52dad9873503..a23ffcd99243 100644
--- a/sys-apps/smartmontools/smartmontools-5.0.45.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.0.45.ebuild,v 1.5 2003/03/10 17:19:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.0.45.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
 
 MY_P="${PN}-5.0-45"
 DESCRIPTION="control and monitor storage systems using the Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.)"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/smartmontools/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc"
+KEYWORDS="x86 amd64 sparc"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-apps/smartmontools/smartmontools-5.1.11.ebuild b/sys-apps/smartmontools/smartmontools-5.1.11.ebuild
index a49c5932ac06..6ef8d1d948fc 100644
--- a/sys-apps/smartmontools/smartmontools-5.1.11.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.1.11.ebuild,v 1.3 2003/06/02 22:46:30 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.1.11.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:4:6}
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc"
+KEYWORDS="x86 amd64 sparc"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild
index fe950785b6f0..fcc44eda8276 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild,v 1.1 2003/03/22 23:14:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.ta
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc -x86 -ppc -alpha -mips -hppa -arm"
+KEYWORDS="x86 amd64 -ppc -alpha -mips -hppa -arm"
 
 DEPEND="sys-kernel/linux-headers"
 RDEPEND="virtual/glibc"
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
index d071f59c8021..275e3d7fefac 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9.ebuild,v 1.14 2003/03/11 05:58:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9.ebuild,v 1.15 2003/06/21 21:19:40 drobbins Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.ta
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc -x86 -ppc -alpha -mips -hppa -arm"
+KEYWORDS="x86 amd64 -ppc -alpha -mips -hppa -arm"
 
 DEPEND="sys-kernel/linux-headers"
 RDEPEND="virtual/glibc"
diff --git a/sys-apps/star/star-1.4.3.ebuild b/sys-apps/star/star-1.4.3.ebuild
index 28dfea4b48f6..a76385eb8af6 100644
--- a/sys-apps/star/star-1.4.3.ebuild
+++ b/sys-apps/star/star-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.4.3.ebuild,v 1.2 2003/06/12 00:26:12 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.4.3.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
@@ -12,7 +12,7 @@ DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
 SRC_URI="ftp://ftp.berlios.de/pub/${PN}/${P}.tar.bz2"
 
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
diff --git a/sys-apps/star/star-1.5_alpha14.ebuild b/sys-apps/star/star-1.5_alpha14.ebuild
index e3e6fbbd4653..518aff79bf76 100644
--- a/sys-apps/star/star-1.5_alpha14.ebuild
+++ b/sys-apps/star/star-1.5_alpha14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.5_alpha14.ebuild,v 1.1 2003/06/11 17:59:44 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.5_alpha14.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/${PN}/alpha/${PN}-${PV/_alpha/a}.tar.bz2"
 #SRC_URI="ftp://ftp.berlios.de/pub/${PN}/${P}.tar.bz2"
 
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
-KEYWORDS="~x86 ~ppc ~sparc hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc hppa"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
diff --git a/sys-apps/stat/stat-2.5.ebuild b/sys-apps/stat/stat-2.5.ebuild
index 2cd3fd4e6e39..5098f4429e79 100644
--- a/sys-apps/stat/stat-2.5.ebuild
+++ b/sys-apps/stat/stat-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/stat-2.5.ebuild,v 1.9 2003/04/25 16:06:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/stat-2.5.ebuild,v 1.10 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/linux/utils/file/${P}.tar.gz
 	 selinux? mirror://gentoo/${P}-selinux.patch.bz2"
 HOMEPAGE="http://www.gnu.org/directory/stat.html"
 
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="selinux"
diff --git a/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild b/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
index bad691323791..31fbbd719bb7 100644
--- a/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
+++ b/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild,v 1.14 2003/04/08 23:04:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild,v 1.15 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="gtk"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="strace meets expect"
 SRC_URI="mirror://sourceforge/subterfugue/${P}.tgz"
 HOMEPAGE="http://www.subterfugue.org/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/subterfugue/subterfugue-0.2.1a.ebuild b/sys-apps/subterfugue/subterfugue-0.2.1a.ebuild
index ee2cbcae44c3..5e54f0593d0d 100644
--- a/sys-apps/subterfugue/subterfugue-0.2.1a.ebuild
+++ b/sys-apps/subterfugue/subterfugue-0.2.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2.1a.ebuild,v 1.1 2003/04/08 23:04:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2.1a.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="strace meets expect"
 SRC_URI="mirror://sourceforge/subterfugue/${P}.tgz"
 HOMEPAGE="http://www.subterfugue.org/"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/supersed/supersed-3.58-r1.ebuild b/sys-apps/supersed/supersed-3.58-r1.ebuild
index b7310951c5bb..a916e63f8e4c 100644
--- a/sys-apps/supersed/supersed-3.58-r1.ebuild
+++ b/sys-apps/supersed/supersed-3.58-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.58-r1.ebuild,v 1.7 2003/02/13 16:16:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.58-r1.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://queen.rett.polimi.it/~paolob/seders/ssed/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 DEPEND="dev-libs/libpcre
 	nls? ( sys-devel/gettext )"
diff --git a/sys-apps/supersed/supersed-3.58-r2.ebuild b/sys-apps/supersed/supersed-3.58-r2.ebuild
index 146ee05f31cc..41998cad5c93 100644
--- a/sys-apps/supersed/supersed-3.58-r2.ebuild
+++ b/sys-apps/supersed/supersed-3.58-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.58-r2.ebuild,v 1.9 2003/02/13 16:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.58-r2.ebuild,v 1.10 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://queen.rett.polimi.it/~paolob/seders/ssed/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 
 DEPEND="dev-libs/libpcre
 	nls? ( sys-devel/gettext )"
diff --git a/sys-apps/supersed/supersed-3.60.ebuild b/sys-apps/supersed/supersed-3.60.ebuild
index 46c83e260a66..c6876fdd96c6 100644
--- a/sys-apps/supersed/supersed-3.60.ebuild
+++ b/sys-apps/supersed/supersed-3.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.60.ebuild,v 1.2 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.60.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://queen.rett.polimi.it/~paolob/seders/ssed/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 mips"
+KEYWORDS="x86 amd64 mips"
 
 DEPEND="virtual/glibc
 	>=sys-apps/portage-2.0.45-r3
diff --git a/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild b/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild
index 91c840f3171e..877f163a8b7d 100644
--- a/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild
+++ b/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild,v 1.9 2003/02/13 16:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild,v 1.10 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Starting and stopping daemontools managed services."
 SRC_URI="http://untroubled.org/supervise-scripts/${P}.tar.gz"
 HOMEPAGE="http://untroubled.org/supervise-scripts/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 RDEPENDS=">=sys-apps/daemontools-0.70"
diff --git a/sys-apps/syscriptor/syscriptor-1.5.12.ebuild b/sys-apps/syscriptor/syscriptor-1.5.12.ebuild
index 35b0c478cfc3..340aff555cec 100644
--- a/sys-apps/syscriptor/syscriptor-1.5.12.ebuild
+++ b/sys-apps/syscriptor/syscriptor-1.5.12.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syscriptor/syscriptor-1.5.12.ebuild,v 1.3 2003/06/12 22:10:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syscriptor/syscriptor-1.5.12.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program that displays information about your hardware"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://syscriptor.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 
 IUSE=""
diff --git a/sys-apps/syslinux/syslinux-1.75.ebuild b/sys-apps/syslinux/syslinux-1.75.ebuild
index a6678c9b0d93..6c0da225cb48 100644
--- a/sys-apps/syslinux/syslinux-1.75.ebuild
+++ b/sys-apps/syslinux/syslinux-1.75.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslinux/syslinux-1.75.ebuild,v 1.7 2003/05/25 15:23:52 mholzer Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslinux/syslinux-1.75.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $ 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.gz"
 
-KEYWORDS="x86 -ppc -sparc "
+KEYWORDS="x86 amd64 -ppc -sparc "
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/syslinux/syslinux-2.01.ebuild b/sys-apps/syslinux/syslinux-2.01.ebuild
index 2e870d9f43c9..89119c5a3018 100644
--- a/sys-apps/syslinux/syslinux-2.01.ebuild
+++ b/sys-apps/syslinux/syslinux-2.01.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslinux/syslinux-2.01.ebuild,v 1.3 2003/05/25 15:23:52 mholzer Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslinux/syslinux-2.01.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $ 
 
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
 
-KEYWORDS="~x86 -ppc -sparc "
+KEYWORDS="x86 amd64 -ppc -sparc "
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/syslinux/syslinux-2.02.ebuild b/sys-apps/syslinux/syslinux-2.02.ebuild
index c29328a43322..8d82e9f99da4 100644
--- a/sys-apps/syslinux/syslinux-2.02.ebuild
+++ b/sys-apps/syslinux/syslinux-2.02.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslinux/syslinux-2.02.ebuild,v 1.2 2003/05/25 15:23:52 mholzer Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslinux/syslinux-2.02.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $ 
 
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
 
-KEYWORDS="x86 -ppc -sparc "
+KEYWORDS="x86 amd64 -ppc -sparc "
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/systrace/systrace-1.0-r1.ebuild b/sys-apps/systrace/systrace-1.0-r1.ebuild
index 3586a8855d05..9fcc359e8550 100644
--- a/sys-apps/systrace/systrace-1.0-r1.ebuild
+++ b/sys-apps/systrace/systrace-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systrace/systrace-1.0-r1.ebuild,v 1.3 2003/06/12 22:11:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systrace/systrace-1.0-r1.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Systrace userland binary"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/systrace/index.html"
@@ -13,7 +13,7 @@ INCLUDE0="/usr/src/linux/include/linux/systrace.h"
 INCLUDE1="/usr/include/linux/systrace.h"
 S="${WORKDIR}/${P}"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="gtk"
 DEPEND="gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
 
diff --git a/sys-apps/systrace/systrace-1.0-r2.ebuild b/sys-apps/systrace/systrace-1.0-r2.ebuild
index 362d7fcf5d5b..bf3ad2c48a4a 100644
--- a/sys-apps/systrace/systrace-1.0-r2.ebuild
+++ b/sys-apps/systrace/systrace-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systrace/systrace-1.0-r2.ebuild,v 1.2 2003/06/12 22:11:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systrace/systrace-1.0-r2.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Systrace userland binary"
 HOMEPAGE="http://www.systrace.org"
@@ -13,7 +13,7 @@ INCLUDE0="/usr/src/linux/include/linux/systrace.h"
 INCLUDE1="/usr/include/linux/systrace.h"
 S="${WORKDIR}/${P}"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="gtk"
 DEPEND="gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
 
diff --git a/sys-apps/systrace/systrace-1.0-r3.ebuild b/sys-apps/systrace/systrace-1.0-r3.ebuild
index a72644bee429..f590d5143956 100644
--- a/sys-apps/systrace/systrace-1.0-r3.ebuild
+++ b/sys-apps/systrace/systrace-1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systrace/systrace-1.0-r3.ebuild,v 1.2 2003/06/12 22:11:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systrace/systrace-1.0-r3.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Systrace userland binary"
 HOMEPAGE="http://www.systrace.org"
@@ -12,7 +12,7 @@ PATCH1="systrace.c-no_x11-1.0.patch"
 INCLUDE="/usr/include/linux/systrace.h"
 S="${WORKDIR}/${P}"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="gtk"
 DEPEND="gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
 
diff --git a/sys-apps/sysvinit/sysvinit-2.83-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.83-r1.ebuild
index e23832becb5f..ee30d22fac8e 100644
--- a/sys-apps/sysvinit/sysvinit-2.83-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.83-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.83-r1.ebuild,v 1.11 2003/02/10 09:58:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.83-r1.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}/src
 DESCRIPTION="System initialization stuff"
@@ -9,7 +9,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 RDEPEND="sys-apps/file"
 
diff --git a/sys-apps/sysvinit/sysvinit-2.83.ebuild b/sys-apps/sysvinit/sysvinit-2.83.ebuild
index 8c8b38a3614e..f8f4e836dfad 100644
--- a/sys-apps/sysvinit/sysvinit-2.83.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.83.ebuild,v 1.7 2003/02/10 09:58:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.83.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}/src
 DESCRIPTION="System initialization stuff"
@@ -9,7 +9,7 @@ HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 RDEPEND="sys-apps/file"
 
diff --git a/sys-apps/tar/tar-1.13.25-r1.ebuild b/sys-apps/tar/tar-1.13.25-r1.ebuild
index 8c8de8c5fafa..e91dfd68c089 100644
--- a/sys-apps/tar/tar-1.13.25-r1.ebuild
+++ b/sys-apps/tar/tar-1.13.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r1.ebuild,v 1.8 2003/02/13 16:16:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r1.ebuild,v 1.9 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -9,7 +9,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Use this to try make tarballs :)"
 SRC_URI="ftp://alpha.gnu.org/gnu/tar/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/tar/tar-1.13.25-r2.ebuild b/sys-apps/tar/tar-1.13.25-r2.ebuild
index 6d6f512833a6..59753e2ddb8e 100644
--- a/sys-apps/tar/tar-1.13.25-r2.ebuild
+++ b/sys-apps/tar/tar-1.13.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r2.ebuild,v 1.13 2003/02/13 16:16:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r2.ebuild,v 1.14 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/tar/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 amd64 ppc sparc alpha"
 
 DEPEND="sys-apps/gzip
 	sys-apps/bzip2
diff --git a/sys-apps/tar/tar-1.13.25-r3.ebuild b/sys-apps/tar/tar-1.13.25-r3.ebuild
index 7c96c878ce2d..8de0e4d2fb02 100644
--- a/sys-apps/tar/tar-1.13.25-r3.ebuild
+++ b/sys-apps/tar/tar-1.13.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r3.ebuild,v 1.13 2003/05/20 08:35:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r3.ebuild,v 1.14 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils gnuconfig
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnu.org/software/tar/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha mips hppa arm"
+KEYWORDS="x86 amd64 alpha mips hppa arm"
 
 DEPEND="sys-apps/gzip
 	sys-apps/bzip2
diff --git a/sys-apps/tcb/tcb-0.9.7.4.ebuild b/sys-apps/tcb/tcb-0.9.7.4.ebuild
index 3c3445210a78..5a2b85412c94 100644
--- a/sys-apps/tcb/tcb-0.9.7.4.ebuild
+++ b/sys-apps/tcb/tcb-0.9.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.7.4.ebuild,v 1.5 2003/02/13 16:16:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.7.4.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 DEPEND=">=sys-libs/pam-0.75"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 pkg_preinst() {
 	# might want to add these into baselayout eventually...
diff --git a/sys-apps/tcb/tcb-0.9.8.3.ebuild b/sys-apps/tcb/tcb-0.9.8.3.ebuild
index 62210cfaede3..3a10e8200250 100644
--- a/sys-apps/tcb/tcb-0.9.8.3.ebuild
+++ b/sys-apps/tcb/tcb-0.9.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.8.3.ebuild,v 1.2 2003/02/13 16:16:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.8.3.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 DEPEND=">=sys-libs/pam-0.75"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 pkg_preinst() {
 	# might want to add these into baselayout eventually...
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
index 1f7636064ed9..d25c7519a47d 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild,v 1.11 2003/02/11 14:14:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="x86 sparc"
+KEYWORDS="x86 amd64 sparc"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
index 9532c62910c7..dd37a17753c9 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild,v 1.18 2003/02/22 02:18:35 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild,v 1.19 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild
index 9324bc301672..8297d292aa21 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild,v 1.4 2003/02/11 14:14:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/texinfo/texinfo-4.3-r1.ebuild b/sys-apps/texinfo/texinfo-4.3-r1.ebuild
index 813eb5432554..b62fbcc825fd 100644
--- a/sys-apps/texinfo/texinfo-4.3-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.3-r1.ebuild,v 1.9 2003/03/27 02:32:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.3-r1.ebuild,v 1.10 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.gnu.org/pub/gnu/texinfo/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4.0.5
diff --git a/sys-apps/texinfo/texinfo-4.5.ebuild b/sys-apps/texinfo/texinfo-4.5.ebuild
index cbf2ead40b55..4ffa709abbd7 100644
--- a/sys-apps/texinfo/texinfo-4.5.ebuild
+++ b/sys-apps/texinfo/texinfo-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.5.ebuild,v 1.4 2003/03/27 02:32:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.5.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls build"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/texinfo/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm mips"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	!build? ( >=sys-libs/ncurses-5.2-r2
diff --git a/sys-apps/textutils/textutils-2.0.19-r1.ebuild b/sys-apps/textutils/textutils-2.0.19-r1.ebuild
index 24eb43c72bde..5050dc32f63c 100644
--- a/sys-apps/textutils/textutils-2.0.19-r1.ebuild
+++ b/sys-apps/textutils/textutils-2.0.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.19-r1.ebuild,v 1.11 2003/02/13 16:17:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.19-r1.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU text utilities"
 SRC_URI="http://fetish.sf.net/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86  ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
diff --git a/sys-apps/textutils/textutils-2.0.19-r2.ebuild b/sys-apps/textutils/textutils-2.0.19-r2.ebuild
index 4b79273bbcc1..8f6945a1b4dc 100644
--- a/sys-apps/textutils/textutils-2.0.19-r2.ebuild
+++ b/sys-apps/textutils/textutils-2.0.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.19-r2.ebuild,v 1.7 2003/02/13 16:17:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.19-r2.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard GNU text utilities"
 SRC_URI="http://fetish.sf.net/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
 
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86  ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/textutils/textutils-2.0.21.ebuild b/sys-apps/textutils/textutils-2.0.21.ebuild
index e247e649b4bb..b2c961a6d2a1 100644
--- a/sys-apps/textutils/textutils-2.0.21.ebuild
+++ b/sys-apps/textutils/textutils-2.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.21.ebuild,v 1.9 2003/02/13 16:17:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.21.ebuild,v 1.10 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard GNU text utilities"
 SRC_URI="http://fetish.sf.net/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
 
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86  ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/textutils/textutils-2.1.ebuild b/sys-apps/textutils/textutils-2.1.ebuild
index 29f81935eb1b..550327c69742 100644
--- a/sys-apps/textutils/textutils-2.1.ebuild
+++ b/sys-apps/textutils/textutils-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1.ebuild,v 1.11 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="nls static build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Standard GNU text utilities"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86  ppc sparc alpha mips hppa arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/thinkpad/thinkpad-3.2.ebuild b/sys-apps/thinkpad/thinkpad-3.2.ebuild
index b3dec100fd33..a304405f79f4 100644
--- a/sys-apps/thinkpad/thinkpad-3.2.ebuild
+++ b/sys-apps/thinkpad/thinkpad-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-3.2.ebuild,v 1.11 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-3.2.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
@@ -9,7 +9,7 @@ KV=""
 DESCRIPTION="Thinkpad system control kernel modules"
 SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 -ppc -mips"
+KEYWORDS="x86 amd64 -ppc -mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/thinkpad/thinkpad-4.1.ebuild b/sys-apps/thinkpad/thinkpad-4.1.ebuild
index 5379249353b4..5b2b469ce683 100644
--- a/sys-apps/thinkpad/thinkpad-4.1.ebuild
+++ b/sys-apps/thinkpad/thinkpad-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-4.1.ebuild,v 1.2 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-4.1.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
@@ -8,7 +8,7 @@ MYP="${PN}_${MYPV}"
 DESCRIPTION="Thinkpad system control kernel modules"
 SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 -ppc -mips"
+KEYWORDS="x86 amd64 -ppc -mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/thinkpad/thinkpad-4.3.ebuild b/sys-apps/thinkpad/thinkpad-4.3.ebuild
index 43fa8d48df39..0203f7818641 100644
--- a/sys-apps/thinkpad/thinkpad-4.3.ebuild
+++ b/sys-apps/thinkpad/thinkpad-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-4.3.ebuild,v 1.1 2003/05/04 13:19:50 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-4.3.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
@@ -8,7 +8,7 @@ MYP="${PN}_${MYPV}"
 DESCRIPTION="Thinkpad system control kernel modules"
 SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="~x86 -ppc -mips -sparc"
+KEYWORDS="x86 amd64 -ppc -mips -sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/tic98/tic98-1.01-r1.ebuild b/sys-apps/tic98/tic98-1.01-r1.ebuild
index 95109068524f..75cdb3e6e720 100644
--- a/sys-apps/tic98/tic98-1.01-r1.ebuild
+++ b/sys-apps/tic98/tic98-1.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tic98/tic98-1.01-r1.ebuild,v 1.3 2003/02/13 16:17:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tic98/tic98-1.01-r1.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="tic98 is a compressor for black-and-white images, in particular scanned documents. It gets very good compression, better than AT&T's DjVu system.  tic98 also includes ppmd text compression (ppmd) and number compression (b_gamma_enc)"
 HOMEPAGE="http://www.cs.waikato.ac.nz/~singlis/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.cs.waikato.ac.nz/~singlis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=""
 
diff --git a/sys-apps/tic98/tic98-1.01.ebuild b/sys-apps/tic98/tic98-1.01.ebuild
index fddd63b5142c..80438090221c 100644
--- a/sys-apps/tic98/tic98-1.01.ebuild
+++ b/sys-apps/tic98/tic98-1.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tic98/tic98-1.01.ebuild,v 1.5 2003/02/28 13:18:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tic98/tic98-1.01.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="tic98 is a compressor for black-and-white images, in particular scanned documents. It gets very good compression, better than AT&T's DjVu system.  tic98 also includes ppmd text compression (ppmd) and number compression (b_gamma_enc)"
 HOMEPAGE="http://www.cs.waikato.ac.nz/~singlis/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.cs.waikato.ac.nz/~singlis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND=""
 
diff --git a/sys-apps/time/time-1.7-r1.ebuild b/sys-apps/time/time-1.7-r1.ebuild
index 8f3a207c11ed..76839c89ea6c 100644
--- a/sys-apps/time/time-1.7-r1.ebuild
+++ b/sys-apps/time/time-1.7-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7-r1.ebuild,v 1.12 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7-r1.ebuild,v 1.13 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command that displays info about resources used by a program"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/time/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/time.html"
-KEYWORDS="x86 ppc sparc arm"
+KEYWORDS="x86 amd64 ppc sparc arm"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/time/time-1.7.ebuild b/sys-apps/time/time-1.7.ebuild
index 322b80feaf66..0daf9e7d9451 100644
--- a/sys-apps/time/time-1.7.ebuild
+++ b/sys-apps/time/time-1.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7.ebuild,v 1.6 2003/02/13 16:18:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7.ebuild,v 1.7 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command that displays info about resources used by a program"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/time/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/time.html"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/tinylogin/tinylogin-1.2.ebuild b/sys-apps/tinylogin/tinylogin-1.2.ebuild
index 6cdfe19caea9..e0baad231184 100644
--- a/sys-apps/tinylogin/tinylogin-1.2.ebuild
+++ b/sys-apps/tinylogin/tinylogin-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tinylogin/tinylogin-1.2.ebuild,v 1.2 2003/02/13 16:18:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tinylogin/tinylogin-1.2.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="worlds smallest login/passwd/getty/etc"
 HOMEPAGE="http://tinylogin.busybox.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://tinylogin.busybox.net/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND="virtual/glibc"
diff --git a/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild b/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild
index 975855c5dd1d..114109aefb91 100644
--- a/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild
+++ b/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild,v 1.15 2003/02/13 16:18:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild,v 1.16 2003/06/21 21:19:41 drobbins Exp $
 
 MYP="tmpreaper_1.4.12"
 S=${WORKDIR}/${P}
@@ -8,7 +8,7 @@ DESCRIPTION="A utility for removing files based on when they were last
 accessed"
 SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/admin/${MYP}.tar.gz"
 HOMEPAGE="http://packages.debian.org/stable/admin/tmpreaper.html"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/tpb/tpb-0.4.2.ebuild b/sys-apps/tpb/tpb-0.4.2.ebuild
index 477cc0c776b2..aa1914a0e8b0 100644
--- a/sys-apps/tpb/tpb-0.4.2.ebuild
+++ b/sys-apps/tpb/tpb-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpb/tpb-0.4.2.ebuild,v 1.1 2003/04/01 23:00:21 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpb/tpb-0.4.2.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Thinkpad button utility"
 HOMEPAGE="http://savannah.nongnu.org/projects/tpb/"
@@ -8,7 +8,7 @@ SRC_URI="http://savannah.nongnu.org/download/tpb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND="x11-libs/xosd"
diff --git a/sys-apps/tpb/tpb-0.5.1.ebuild b/sys-apps/tpb/tpb-0.5.1.ebuild
index 268f64e99767..6ce749d7b11d 100644
--- a/sys-apps/tpb/tpb-0.5.1.ebuild
+++ b/sys-apps/tpb/tpb-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpb/tpb-0.5.1.ebuild,v 1.1 2003/04/15 14:04:35 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpb/tpb-0.5.1.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Thinkpad button utility"
 HOMEPAGE="http://savannah.nongnu.org/projects/tpb/"
@@ -8,7 +8,7 @@ SRC_URI="http://savannah.nongnu.org/download/tpb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="X nls"
 
 DEPEND="X? ( x11-libs/xosd )"
diff --git a/sys-apps/tpctl/tpctl-3.2.ebuild b/sys-apps/tpctl/tpctl-3.2.ebuild
index 3bfbf195476a..36ad9ca97a29 100644
--- a/sys-apps/tpctl/tpctl-3.2.ebuild
+++ b/sys-apps/tpctl/tpctl-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-3.2.ebuild,v 1.11 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-3.2.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="ncurses tpctlir perl"
 
@@ -12,7 +12,7 @@ KV=""
 DESCRIPTION="Thinkpad system control user space programs"
 SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/tpctl/tpctl-4.2.ebuild b/sys-apps/tpctl/tpctl-4.2.ebuild
index 793bb5438d45..de64df84abe3 100644
--- a/sys-apps/tpctl/tpctl-4.2.ebuild
+++ b/sys-apps/tpctl/tpctl-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-4.2.ebuild,v 1.2 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-4.2.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="ncurses tpctlir perl"
 
@@ -11,7 +11,7 @@ MYP="${PN}_${MYPV}"
 DESCRIPTION="Thinkpad system control user space programs"
 SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/tpctl/tpctl-4.4.ebuild b/sys-apps/tpctl/tpctl-4.4.ebuild
index f808fd756fed..42e870b3d200 100644
--- a/sys-apps/tpctl/tpctl-4.4.ebuild
+++ b/sys-apps/tpctl/tpctl-4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-4.4.ebuild,v 1.1 2003/05/04 13:18:17 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-4.4.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="ncurses tpctlir perl"
 
@@ -11,7 +11,7 @@ MYP="${PN}_${MYPV}"
 DESCRIPTION="Thinkpad system control user space programs"
 SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="~x86 -ppc -mips -sparc"
+KEYWORDS="x86 amd64 -ppc -mips -sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild
index c313278db2e8..50e373bffb01 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild,v 1.3 2003/03/16 23:12:16 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
 HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
 
 SLOT="0"
-KEYWORDS="x86 sparc ppc alpha"
+KEYWORDS="x86 amd64 sparc ppc alpha"
 LICENSE="as-is"
 IUSE="ssl ipv6"
 
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.34.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.34.ebuild
index 2fc292892f23..cd04cbe7d20f 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.34.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.34.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.34.ebuild,v 1.8 2003/02/13 16:19:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.34.ebuild,v 1.9 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A ucspi implementation for unix sockets."
 SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
 
 HOMEPAGE="http://untroubled.org"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36.ebuild
index 1bda129158a0..1e5e5ab2ba11 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36.ebuild,v 1.1 2003/04/23 21:11:29 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A ucspi implementation for unix sockets."
@@ -8,7 +8,7 @@ SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
 
 DEPEND=">=dev-libs/bglibs-1.009"
 HOMEPAGE="http://untroubled.org/ucspi-unix/"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/udftools/udftools-1.0.0b.ebuild b/sys-apps/udftools/udftools-1.0.0b.ebuild
index 6d5bda125980..9e8585b69bd1 100644
--- a/sys-apps/udftools/udftools-1.0.0b.ebuild
+++ b/sys-apps/udftools/udftools-1.0.0b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/udftools/udftools-1.0.0b.ebuild,v 1.4 2003/02/13 16:19:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/udftools/udftools-1.0.0b.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 # Unfortunately, its true version name is illegal for portage
 P="udftools-1.0.0b2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/linux-udf/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usbd/usbd-0.1.ebuild b/sys-apps/usbd/usbd-0.1.ebuild
index 5b8d0a69384c..7aa9104014f2 100644
--- a/sys-apps/usbd/usbd-0.1.ebuild
+++ b/sys-apps/usbd/usbd-0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbd/usbd-0.1.ebuild,v 1.2 2003/02/13 16:19:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbd/usbd-0.1.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="USB Daemon"
 HOMEPAGE="http://usb.cs.tum.edu"
 SRC_URI="http://usb.cs.tum.edu/download/usbd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND="virtual/glibc
 	>=sys-apps/usbutils-0.11"
diff --git a/sys-apps/usbutils/usbutils-0.11-r1.ebuild b/sys-apps/usbutils/usbutils-0.11-r1.ebuild
index 86abf7b13a66..631431687d65 100644
--- a/sys-apps/usbutils/usbutils-0.11-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r1.ebuild,v 1.2 2003/06/12 00:17:51 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r1.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="USB enumeration utilities"
 SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz"
 HOMEPAGE="http://usb.cs.tum.edu/"
-KEYWORDS="x86 ~ppc ~sparc ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~hppa"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/sys-apps/usbutils/usbutils-0.11.ebuild b/sys-apps/usbutils/usbutils-0.11.ebuild
index 9b2578a557d9..79e3aa05f31d 100644
--- a/sys-apps/usbutils/usbutils-0.11.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11.ebuild,v 1.5 2003/03/25 11:38:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="USB enumeration utilities"
 SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz"
 HOMEPAGE="http://usb.cs.tum.edu/"
-KEYWORDS="x86 ~ppc ~sparc ~hppa"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~hppa"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/sys-apps/usbutils/usbutils-0.9.ebuild b/sys-apps/usbutils/usbutils-0.9.ebuild
index 89e36b3ccf97..8e544c2b76aa 100644
--- a/sys-apps/usbutils/usbutils-0.9.ebuild
+++ b/sys-apps/usbutils/usbutils-0.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.9.ebuild,v 1.11 2003/02/13 16:19:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.9.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="USB enumeration utilities"
 SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz"
 HOMEPAGE="http://usb.cs.tum.edu/"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild
index 1cbfe2906430..d561c30a9107 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild,v 1.7 2003/02/13 16:20:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc sparc  -alpha"
+KEYWORDS="x86 amd64 -ppc sparc  -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20021102.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20021102.ebuild
index 462cfca9ceb0..73b3594b7c11 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20021102.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20021102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20021102.ebuild,v 1.4 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20021102.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20021103.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20021103.ebuild
index 031d27bdadc8..d35d0ec0b913 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20021103.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20021103.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20021103.ebuild,v 1.4 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20021103.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20030118.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20030118.ebuild
index bb6008e4f0d8..92ebf4570dd5 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20030118.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20030118.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030118.ebuild,v 1.3 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030118.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20030120.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20030120.ebuild
index 571df158f326..7df654524b63 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20030120.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20030120.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030120.ebuild,v 1.3 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030120.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20030122.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20030122.ebuild
index 8c3681db9922..fa7c6b19cc89 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20030122.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20030122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030122.ebuild,v 1.3 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030122.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20030202.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20030202.ebuild
index 2b78cc50fade..dcdb4dc6ce90 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20030202.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20030202.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030202.ebuild,v 1.1 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030202.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20030205-r1.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20030205-r1.ebuild
index ebc35ee862aa..6a17b395b3bc 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20030205-r1.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20030205-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030205-r1.ebuild,v 1.2 2003/03/12 20:17:46 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030205-r1.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20030205.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20030205.ebuild
index f9e9a2097770..4864606b9bb7 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20030205.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20030205.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030205.ebuild,v 1.1 2003/03/02 20:47:42 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20030205.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -9,7 +9,7 @@ HOMEPAGE="http://user-mode-linux.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 amd64 -ppc ~sparc -alpha"
 
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/utempter/utempter-0.5.2.ebuild b/sys-apps/utempter/utempter-0.5.2.ebuild
index 418229d24b8c..3801c41a19ac 100644
--- a/sys-apps/utempter/utempter-0.5.2.ebuild
+++ b/sys-apps/utempter/utempter-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.2.ebuild,v 1.5 2003/04/05 22:31:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.2.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="App that allows non-privileged apps to write utmp (login) info, which needs root access"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
 RDEPEND="virtual/glibc"
 
diff --git a/sys-apps/util-linux/util-linux-2.11y.ebuild b/sys-apps/util-linux/util-linux-2.11y.ebuild
index b9fab45fc30b..2e35a9cab87f 100644
--- a/sys-apps/util-linux/util-linux-2.11y.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11y.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11y.ebuild,v 1.10 2003/05/25 15:26:46 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11y.ebuild,v 1.11 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="crypt nls"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
 #	crypt? ( http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${CRYPT_PATCH_P}.patch.gz )"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/util-linux/util-linux-2.11z-r4.ebuild b/sys-apps/util-linux/util-linux-2.11z-r4.ebuild
index f810e1998e6d..117808ed4283 100644
--- a/sys-apps/util-linux/util-linux-2.11z-r4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11z-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r4.ebuild,v 1.3 2003/06/10 17:01:29 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r4.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 IUSE="crypt nls selinux static pam"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
 	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~mips"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha ~arm ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/vcron/vcron-3.0.1-r1.ebuild b/sys-apps/vcron/vcron-3.0.1-r1.ebuild
index 2d581230b424..69d11890887d 100644
--- a/sys-apps/vcron/vcron-3.0.1-r1.ebuild
+++ b/sys-apps/vcron/vcron-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r1.ebuild,v 1.21 2003/05/07 20:29:34 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r1.ebuild,v 1.22 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="The Vixie cron daemon"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 	 selinux? mirror://gentoo/${P}-selinux.patch.bz2"
 HOMEPAGE=""
-KEYWORDS="x86 ppc sparc alpha arm mips hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha arm mips hppa"
 SLOT="0"
 LICENSE="as-is"
 
diff --git a/sys-apps/watchpid/watchpid-0.1-r1.ebuild b/sys-apps/watchpid/watchpid-0.1-r1.ebuild
index 4dd5822fa16a..1aea72221c51 100644
--- a/sys-apps/watchpid/watchpid-0.1-r1.ebuild
+++ b/sys-apps/watchpid/watchpid-0.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchpid/watchpid-0.1-r1.ebuild,v 1.9 2003/02/13 16:22:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchpid/watchpid-0.1-r1.ebuild,v 1.10 2003/06/21 21:19:41 drobbins Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Watches a process for termination"
 SRC_URI="http://www.codepark.org/projects/utils/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://www.codepark.org/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
diff --git a/sys-apps/which/which-2.12-r2.ebuild b/sys-apps/which/which-2.12-r2.ebuild
index e2e1a3ef6f18..754a6a05d56f 100644
--- a/sys-apps/which/which-2.12-r2.ebuild
+++ b/sys-apps/which/which-2.12-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.12-r2.ebuild,v 1.13 2003/02/13 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.12-r2.ebuild,v 1.14 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
 SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 RDEPEND="virtual/glibc
 	sys-apps/texinfo"
diff --git a/sys-apps/which/which-2.13.ebuild b/sys-apps/which/which-2.13.ebuild
index d29a5caa4334..be1d9be6fed5 100644
--- a/sys-apps/which/which-2.13.ebuild
+++ b/sys-apps/which/which-2.13.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.13.ebuild,v 1.12 2003/02/13 16:22:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.13.ebuild,v 1.13 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
 SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 amd64 ppc sparc "
 
 RDEPEND="virtual/glibc
 	sys-apps/texinfo"
diff --git a/sys-apps/which/which-2.14.ebuild b/sys-apps/which/which-2.14.ebuild
index ca3d7a8901f3..555eea09a092 100644
--- a/sys-apps/which/which-2.14.ebuild
+++ b/sys-apps/which/which-2.14.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.14.ebuild,v 1.13 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.14.ebuild,v 1.14 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
 SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 RDEPEND="virtual/glibc
 	sys-apps/texinfo"
diff --git a/sys-apps/x86info/x86info-1.11.ebuild b/sys-apps/x86info/x86info-1.11.ebuild
index c5b913fa404a..f2afc8601320 100644
--- a/sys-apps/x86info/x86info-1.11.ebuild
+++ b/sys-apps/x86info/x86info-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.11.ebuild,v 1.2 2003/05/11 18:16:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.11.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -14,14 +14,9 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="x86 -ppc -sparc -mips -alpha -arm -hppa"
+KEYWORDS="x86 amd64 -ppc -sparc -mips -alpha -arm -hppa"
 
-# fileutils for mknod
-# baselayout for modules-update
-DEPEND="virtual/kernel
-        virtual/glibc
-		sys-apps/fileutils
-		sys-apps/baselayout"
+DEPEND="virtual/kernel"
 
 RDEPEND=""
 
diff --git a/sys-apps/xfsdump/xfsdump-1.1.7.ebuild b/sys-apps/xfsdump/xfsdump-1.1.7.ebuild
index 99f7a1fb7a51..95af7d799489 100644
--- a/sys-apps/xfsdump/xfsdump-1.1.7.ebuild
+++ b/sys-apps/xfsdump/xfsdump-1.1.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-1.1.7.ebuild,v 1.6 2003/02/13 16:22:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-1.1.7.ebuild,v 1.7 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/latest/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/xfsdump/xfsdump-2.0.0_p20020330.ebuild b/sys-apps/xfsdump/xfsdump-2.0.0_p20020330.ebuild
index 7c64b3f2ca6d..f790cdb460fd 100644
--- a/sys-apps/xfsdump/xfsdump-2.0.0_p20020330.ebuild
+++ b/sys-apps/xfsdump/xfsdump-2.0.0_p20020330.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.0.0_p20020330.ebuild,v 1.2 2003/02/13 16:22:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.0.0_p20020330.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/cmd/${PN}
 DESCRIPTION="xfs dump/restore utilities"
 OPV=20020330
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${OPV}.tar.bz2"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 amd64 ppc"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/xfsdump/xfsdump-2.1.5.ebuild b/sys-apps/xfsdump/xfsdump-2.1.5.ebuild
index a88255fbcab3..a2af83051751 100644
--- a/sys-apps/xfsdump/xfsdump-2.1.5.ebuild
+++ b/sys-apps/xfsdump/xfsdump-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.1.5.ebuild,v 1.7 2003/02/13 16:22:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.1.5.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="xfs dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/xfsdump/xfsdump-2.2.4-r1.ebuild b/sys-apps/xfsdump/xfsdump-2.2.4-r1.ebuild
index a131ea437449..a6b293c8e631 100644
--- a/sys-apps/xfsdump/xfsdump-2.2.4-r1.ebuild
+++ b/sys-apps/xfsdump/xfsdump-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.2.4-r1.ebuild,v 1.4 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.2.4-r1.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="xfs dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="x86 ~mips"
+KEYWORDS="x86 amd64 ~mips"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/xfsdump/xfsdump-2.2.4.ebuild b/sys-apps/xfsdump/xfsdump-2.2.4.ebuild
index 66cb41ff4e8d..b618efd70aea 100644
--- a/sys-apps/xfsdump/xfsdump-2.2.4.ebuild
+++ b/sys-apps/xfsdump/xfsdump-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.2.4.ebuild,v 1.2 2003/02/13 16:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.2.4.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,7 +9,7 @@ DESCRIPTION="xfs dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
diff --git a/sys-apps/xinetd/xinetd-2.3.11.ebuild b/sys-apps/xinetd/xinetd-2.3.11.ebuild
index c927406cc389..c3a2bcb7abdf 100644
--- a/sys-apps/xinetd/xinetd-2.3.11.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.11.ebuild,v 1.3 2003/05/19 16:48:39 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.11.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 DESCRIPTION="Xinetd is a powerful replacement for inetd, with advanced features"
 HOMEPAGE="http://www.xinetd.org"
@@ -8,7 +8,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa"
 
 DEPEND="virtual/glibc 
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
diff --git a/sys-apps/xmbmon/xmbmon-2.0.1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.1.ebuild
index cf723e8692fd..6ee5c8181723 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.1.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.1.ebuild,v 1.1 2003/06/01 04:50:44 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.1.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 MY_P="${PN}${PV//.}"
 DESCRIPTION="Mother Board Monitor Program for X Window System"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html"
 SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/${MY_P}.tar.gz"
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="X"
 
 DEPEND="virtual/glibc
diff --git a/sys-apps/yaboot/yaboot-1.3.10-r1.ebuild b/sys-apps/yaboot/yaboot-1.3.10-r1.ebuild
index f472d297b0e3..80367a12dd4b 100644
--- a/sys-apps/yaboot/yaboot-1.3.10-r1.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.10-r1.ebuild,v 1.1 2003/03/15 23:25:42 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.10-r1.ebuild,v 1.2 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils 
 	sys-apps/hfsutils
diff --git a/sys-apps/yaboot/yaboot-1.3.10-r2.ebuild b/sys-apps/yaboot/yaboot-1.3.10-r2.ebuild
index c4bd70730bca..9949bdd9f991 100644
--- a/sys-apps/yaboot/yaboot-1.3.10-r2.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.10-r2.ebuild,v 1.2 2003/04/13 03:06:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.10-r2.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils 
 	sys-apps/hfsutils
diff --git a/sys-apps/yaboot/yaboot-1.3.10.ebuild b/sys-apps/yaboot/yaboot-1.3.10.ebuild
index c6f6f3a7e4cd..3ed10029796c 100644
--- a/sys-apps/yaboot/yaboot-1.3.10.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.10.ebuild,v 1.2 2003/03/11 06:23:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.10.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils 
 	sys-apps/hfsutils
diff --git a/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild b/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild
index d434895a3090..b3765c941ccd 100644
--- a/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild,v 1.12 2003/02/13 16:24:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild,v 1.13 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PPC Bootloader"
@@ -9,7 +9,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils sys-apps/hfsutils"
 
diff --git a/sys-apps/yaboot/yaboot-1.3.7.ebuild b/sys-apps/yaboot/yaboot-1.3.7.ebuild
index bf530580bc84..4f43276d69d8 100644
--- a/sys-apps/yaboot/yaboot-1.3.7.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.7.ebuild,v 1.5 2003/02/13 16:24:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.7.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PPC Bootloader"
@@ -9,7 +9,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils sys-apps/hfsutils"
 
diff --git a/sys-apps/yaboot/yaboot-1.3.8-r1.ebuild b/sys-apps/yaboot/yaboot-1.3.8-r1.ebuild
index 2ce50cc75fba..43d44cec3e4c 100644
--- a/sys-apps/yaboot/yaboot-1.3.8-r1.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.8-r1.ebuild,v 1.3 2003/02/13 16:24:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.8-r1.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PPC Bootloader"
@@ -9,7 +9,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils 
 	sys-apps/hfsutils
diff --git a/sys-apps/yaboot/yaboot-1.3.8.ebuild b/sys-apps/yaboot/yaboot-1.3.8.ebuild
index c0d3bfb6ea9b..759ab8d81449 100644
--- a/sys-apps/yaboot/yaboot-1.3.8.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.8.ebuild,v 1.4 2003/02/13 16:24:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.8.ebuild,v 1.5 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PPC Bootloader"
@@ -9,7 +9,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha"
+KEYWORDS="x86 amd64 -sparc -alpha"
 
 DEPEND="sys-apps/powerpc-utils sys-apps/hfsutils"
 
diff --git a/sys-apps/yard/yard-2.0-r1.ebuild b/sys-apps/yard/yard-2.0-r1.ebuild
index c6c9c245250a..77357bec1826 100644
--- a/sys-apps/yard/yard-2.0-r1.ebuild
+++ b/sys-apps/yard/yard-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.16 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.17 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Yard is a suite of Perl scripts for creating rescue disks (also
@@ -11,7 +11,7 @@ SRC_URI="http://www.croftj.net/~fawcett/yard/${P}.tar.gz
 HOMEPAGE="http://www.linuxlots.com/~fawcett/yard/"
 SLOT="0"
 LICENSE="GPL-2 Artistic"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 DEPEND="dev-lang/perl"
 
 src_unpack() {
diff --git a/sys-apps/yard/yard-2.2.ebuild b/sys-apps/yard/yard-2.2.ebuild
index 52b96b9b706d..3a4c7c008caf 100644
--- a/sys-apps/yard/yard-2.2.ebuild
+++ b/sys-apps/yard/yard-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.2.ebuild,v 1.5 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.2.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Yard is a suite of Perl scripts for creating rescue disks (also
@@ -11,7 +11,7 @@ SRC_URI="http://www.linuxlots.com/~fawcett/yard/${P}.tar.gz
 HOMEPAGE="http://www.linuxlots.com/~fawcett/yard/"
 SLOT="0"
 LICENSE="GPL-2 Artistic"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
 DEPEND="dev-lang/perl"
 RDEPEND=""