--- smage/trunk/core/xorg-server/xorg-server-1.8.0-r2.smage2	2010/05/06 22:58:23	418
+++ smage/trunk/core/xorg-server/xorg-server-1.8.0-r2.smage2	2010/05/06 23:13:19	419
@@ -25,11 +25,6 @@
 	>= media-fonts/font-misc-misc-1
 	>= media-fonts/font-cursor-misc-1
 	>= x11-libs/libXpm-3.5.8
-#	>= x11-libs/libXxf86misc-1.0.2
-#	>= x11-libs/libXxf86vm-1.1.0
-#	>= x11-libs/libXtst-1.1.0
-#	>= x11-libs/libXres-1.0.4
-#	>= x11-libs/libxkbui-1.0.2
 	>= x11-libs/libXinerama-1.1
 	>= sys-fs/udev-151
 	>= x11-libs/pixman-0.16.2
@@ -45,6 +40,11 @@
 #	>= x11-libs/libXaw-1.0.7
 #	>= x11-libs/libdmx-1.1.0
 #	>= x11-base/opengl-update-magellan-2.2.10
+#	>= x11-libs/libXxf86misc-1.0.2
+#	>= x11-libs/libXxf86vm-1.1.0
+#	>= x11-libs/libXtst-1.1.0
+#	>= x11-libs/libXres-1.0.4
+#	>= x11-libs/libxkbui-1.0.2
 
 SDEPEND=">= x11-libs/xtrans-1.2.5
 	>= x11-proto/randrproto-1.3.1
@@ -79,7 +79,27 @@
 #	>= x11-proto/dri2proto-2.1
 #	>= x11-libs/libdrm-2.4.15
 
-sminclude xorg mtools mcore
+# base files
+MCORE_ONLY_KEEP="etc/X11
+	usr/bin/Xorg
+	usr/$(mlibdir)/xorg/protocol.txt
+	var/lib/xkb/README.compiled"
+
+# generic modules
+MCORE_ONLY_KEEP+=" usr/$(mlibdir)/xorg/modules/libvgahw.so
+	usr/$(mlibdir)/xorg/modules/libvbe.so
+	usr/$(mlibdir)/xorg/modules/libshadow.so
+	usr/$(mlibdir)/xorg/modules/libexa.so
+	usr/$(mlibdir)/xorg/modules/libxaa.so
+	usr/$(mlibdir)/xorg/modules/libint10.so
+	usr/$(mlibdir)/xorg/modules/libfb.so
+	usr/$(mlibdir)/xorg/modules/libshadowfb.so"
+
+# generic extensions
+MCORE_ONLY_KEEP+=" usr/$(mlibdir)/xorg/modules/extensions/libextmod.so
+	usr/$(mlibdir)/xorg/modules/extensions/libdbe.so"
+
+sminclude xorg mtools mcore-split
 
 SRC_URI=( ${SRC_URI[*]}
 	mirror://${PNAME}/${SRCFILE}