SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 DEPENDS=xextensions-cvs
+PROVIDES=compositeext
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=CompositeExt
 S=${WORKDIR}/CompositeExt
 
+SECTION="libs"
+MAINTAINER="Greg Gilbert <greg@treke.net>"
+DEPENDS=xextensions-cvs fixesext-cvs
+PROVIDES=damageext
+
+SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=DamageExt
+S=${WORKDIR}/DamageExt
+
+inherit autotools pkgconfig
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 DEPENDS=xextensions-cvs
+PROVIDES=fixesext
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FixesExt
 S=${WORKDIR}/FixesExt
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
+PROVIDES=randr
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Randr
 S=${WORKDIR}/Randr
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
+PROVIDES=render
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Render
 S=${WORKDIR}/Render
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 DEPENDS=xextensions-cvs
+PROVIDES=resourceext
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ResourceExt
 S=${WORKDIR}/ResourceExt
 
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc xproto-cvs xextensions-cvs xau-cvs xtrans-cvs xdmcp-cvs
+PROVIDES=x11
 FILES_x11-cvs_append=" ${datadir}/X11"
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11
 
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc xproto-cvs
+PROVIDES=xau
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau
 S=${WORKDIR}/Xau
 
+SECTION="libs"
+DEPENDS=virtual/libc x11-cvs compositeext-cvs xextensions-cvs fixesext-cvs xfixes-cvs
+PROVIDES=xcomposite
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite
+S=${WORKDIR}/Xcomposite
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
 SECTION="libs"
 #DEPENDS=virtual/libc x11-cvs damageext-cvs xextensions-cvs fixesext-cvs xfixes-cvs
 DEPENDS=virtual/libc x11-cvs damageext-cvs xfixes-cvs xproto-cvs
+PROVIDES=xdamage
 
 SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \
          file://${FILESDIR}/m4.patch;patch=1
 
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc xproto-cvs
+PROVIDES=xdmcp
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp
 S=${WORKDIR}/Xdmcp
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
+PROVIDES=xextensions
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions
 S=${WORKDIR}/XExtensions
 
+SECTION="libs"
+DEPENDS=virtual/libc x11-cvs fixesext-cvs
+PROVIDES=xfixes
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfixes
+S=${WORKDIR}/Xfixes
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc xproto-cvs xtrans-cvs zlib
+PROVIDES=xfont
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont
 S=${WORKDIR}/Xfont
 
+SECTION="libs"
+DEPENDS=virtual/libc x11-cvs xproto-cvs xrender-cvs freetype fontconfig
+PROVIDES=xft
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xft
+S=${WORKDIR}/Xft
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
+SECTION="libs"
+DEPENDS=virtual/libc x11-cvs xextensions-cvs
+PROVIDES=xi
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi
+S=${WORKDIR}/Xi
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
+PROVIDES=xproto
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto
 S=${WORKDIR}/Xproto
 
+SECTION="libs"
+DEPENDS=virtual/libc randr-cvs x11-cvs render-cvs xrender-cvs
+PROVIDES=xrandr
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrandr
+S=${WORKDIR}/Xrandr
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
+SECTION="libs"
+DEPENDS=virtual/libc render-cvs x11-cvs
+PROVIDES=xrender
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrender
+S=${WORKDIR}/Xrender
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+       oe_runmake install DESTDIR=${STAGING_DIR} \
+              bindir=/build/bin \
+              includedir=/target/include \
+              libdir=/target/lib \
+              datadir=/share
+              prefix=
+}
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 DEPENDS=virtual/libc x11-cvs xextensions-cvs xext-cvs resourceext-cvs
+PROVIDES=xres
 
 SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XRes
 S=${WORKDIR}/XRes
 
+RDEPENDS=libc6
+DEPENDS=virtual/libc xproto-cvs xdmcp-cvs xextensions-cvs xtrans-cvs xau-cvs x11-cvs xext-cvs randr-cvs render-cvs xrender-cvs xrandr-cvs fixesext-cvs damageext-cvs xfont-cvs resourceext-cvs compositeext-cvs
+RDEPENDS=libc6 xau-cvs xdmcp-cvs zlib xfont-cvs x11-cvs xext-cvs
+PROVIDES=xserver
+DESCRIPTION='An X server.  The only drivers supplied are based on the kdrive framework.'
+
+SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver
+S=${WORKDIR}/xserver
+
+inherit autotools pkgconfig libtool
+
+EXTRA_OECONF = '--enable-composite'
 
 SECTION="libs"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
+PROVIDES=xtrans
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xtrans
 S=${WORKDIR}/xtrans