--- /usr/portage/x11-terms/xterm/xterm-232.ebuild	2008-03-06 17:07:25.000000000 +0100
+++ /usr/local/portage/x11-terms/xterm/xterm-232.ebuild	2008-03-10 22:39:50.000000000 +0100
@@ -10,7 +10,7 @@
 
 LICENSE="X11"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="truetype Xaw3d unicode toolbar paste64"
 
 RDEPEND="x11-libs/libX11
@@ -35,6 +35,7 @@
 	filter-flags "-fstack-protector"
 	replace-flags "-Os" "-O2" # work around gcc-4.1.1-r[01] bugs
 
+# --enable-tcap-query causes bug #212546.
 	econf --libdir=/etc \
 		--with-x \
 		--with-utempter \
@@ -51,7 +52,6 @@
 		--enable-wide-chars \
 		--enable-doublechars \
 		--enable-warnings \
-		--enable-tcap-query \
 		--enable-logging \
 		--enable-dabbrev \
 		--with-app-defaults=${DEFAULTS_DIR} \