--- xorg-x11-6.8.0.ebuild.orig	2004-09-10 21:52:42.000000000 +0100
+++ xorg-x11-6.8.0.ebuild	2004-09-10 21:59:24.000000000 +0100
@@ -821,6 +821,11 @@
 					sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \
 						${IMAGE}${FILE}
 
+					# Using "uk" as a XkbLayout is a bit broken in 6.8,
+					# and also deprecated, so switch to "gb"
+					sed -i 's~^\([ \t]*Option[ \t]\+"XkbLayout"[ \t]\+\)"uk"~\1"gb"~' \
+						${IMAGE}${FILE}
+
 					# Work around upgrade problem where people have
 					# Option "XkbRules" "xfree86" in their config file
 					sed -i "s:^.*Option.*\"XkbRules\".*$::g" \