--- smage/trunk/core/kdrive/kdrive-1.8.0-r1.smage2	2010/04/26 23:30:22	244
+++ smage/trunk/core/kdrive/kdrive-1.8.0-r1.smage2	2010/04/29 22:46:29	341
@@ -10,10 +10,6 @@
 DESCRIPTION="Modular X.Org X Server."
 HOMEPAGE="http://xorg.freedesktop.org"
 
-sminclude xorg mtools cleanutils mcore-split
-
-PROVIDE="virtual/x11"
-
 DEPEND=">= x11-libs/libXfont-1.4.1
 	>= x11-libs/libXau-1.0.5
 	>= x11-libs/libXext-1.1
@@ -24,6 +20,7 @@
 	>= media-libs/freetype-2.3.9
 	>= media-fonts/font-misc-misc-1
 	>= media-fonts/font-cursor-misc-1
+	>= x11-misc/xkeyboard-config-1.7
 	>= dev-libs/libsha1-0.2"
 #	>= x11-libs/libXv-1.0.5
 
@@ -53,6 +50,11 @@
 	>= x11-apps/mkfontdir-1.0.5
 	>= x11-apps/mkfontscale-1.0.7"
 
+PROVIDE="virtual/x11"
+
+MCORE_ONLY_KEEP="usr/bin usr/share/X11/xkb usr/$(mlibdir)/xorg/protocol.txt"
+sminclude xorg mtools cleanutils mcore-split
+
 SRCFILE="xorg-server-${PVER}.tar.bz2"
 SRCDIR="${BUILDDIR}/xorg-server-${PVER}"
 
@@ -122,8 +124,11 @@
 		--disable-xsdl \
 		--disable-config-dbus \
 		--disable-config-hal \
-		--enable-config-udev \
+		--disable-config-udev \
 		--with-sha1=libsha1 \
+		--enable-kdrive-kbd \
+		--enable-kdrive-mouse \
+		--enable-kdrive-evdev \
 		|| die
 
 	mmake || die