merge of 256698cb5e6bbc32343fd2d7b714517efc0e3d0c

and 27b9c5adc9f3c8d43d5702469feb4aef564a14c4
author: Oyvind Repvik <nail@nslu2-linux.org> 2006-03-14 22:34:13 +0000
committer: OpenEmbedded Project <openembedded-devel@lists.openembedded.org> 2006-03-14 22:34:13 +0000
commit: 9e47d0f0ad0f9903550c50fdb59f773ee0b76ab6 (patch)
tree: fc2e025013c14d1d55bceeb3f8dbea310e9dab46
parent: 9673c57c71bd1b4ea8ab4736d5732134f2f4de7d (diff)
parent: ea6a78777bc9c0a961cd79730da2561c34089362 (diff)
122 files changed, 2015 insertions, 396 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 71dc101f0f..6afd6ca2cd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -298,7 +298,7 @@ export palmqtdir = "/opt/QtPalmtop"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
-GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
+GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
@@ -306,6 +306,7 @@ FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
+APACHE_MIRROR = "http://www.apache.org/dist"
 
 # You can use the mirror of your country to get faster downloads by putting
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index ccaee57d6d..be0f5e93fe 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -52,13 +52,13 @@ PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2"
 
 
 #use EABI toolchain
-#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_binutils ?= "2.16.91.0.4"
-#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.4"
-#PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214"
-#PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214"
+#PREFERRED_VERSION_gcc ?= "4.1.0"
+#PREFERRED_VERSION_gcc-cross ?= "4.1.0"
+#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
+#PREFERRED_VERSION_binutils ?= "2.16.91.0.6"
+#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6"
+#PREFERRED_VERSION_glibc ?= "2.3.6+cvs20060314"
+#PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+cvs20060314"
 
 
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
diff --git a/conf/distro/preferred-x-versions-pre-X11R7.inc b/conf/distro/preferred-x-versions-pre-X11R7.inc
new file mode 100644
index 0000000000..b8cd34a3fb
--- /dev/null
+++ b/conf/distro/preferred-x-versions-pre-X11R7.inc
@@ -0,0 +1,44 @@
+#
+# Specify to build old/old CVS versions of X libraries and apps
+#
+
+PREFERRED_VERSION_xproto         = "0.0+cvs${SRCDATE}"
+
+PREFERRED_VERSION_diet-x11       = "6.2.1+cvs${SRCDATE}"
+PREFERRED_VERSION_libice         = "6.3.3"
+PREFERRED_VERSION_libsm          = "6.0.3"
+PREFERRED_VERSION_libx11         = "6.2.1+cvs${SRCDATE}"
+PREFERRED_VERSION_libxau         = "1.0.1"
+PREFERRED_VERSION_libxaw         = "7.0.2"
+PREFERRED_VERSION_libxcomposite  = "1.0.1"
+PREFERRED_VERSION_libxcursor     = "1.1.2"
+PREFERRED_VERSION_libxdamage     = "1.0.1"
+PREFERRED_VERSION_libxdmcp       = "0.1.3"
+PREFERRED_VERSION_libxext        = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxfixes      = "2.0.1"
+PREFERRED_VERSION_libxfont       = "1.4.2"
+PREFERRED_VERSION_libxft         = "2.1.6"
+PREFERRED_VERSION_libxi          = "6.0.1"
+PREFERRED_VERSION_libxinerama    = "1.0.2+cvs20050505"
+PREFERRED_VERSION_libxkbfile     = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxmu         = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxp          = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxpm         = "3.5.1"
+PREFERRED_VERSION_libxrandr      = "1.0.2"
+PREFERRED_VERSION_libxrender     = "0.8.4"
+PREFERRED_VERSION_libxres        = "1.0.1"
+PREFERRED_VERSION_libxss         = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxt          = "0.1.5"
+PREFERRED_VERSION_libxtst        = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxv          = "2.2.2+cvs20040918"
+PREFERRED_VERSION_libxxf86dga    = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxxf86vm     = "0.0+cvs${SRCDATE}"
+
+PREFERRED_VERSION_xcalibrate     = "0.0+cvs20060312"
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
+
+PREFERRED_VERSION_xdpyinfo       = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xev            = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xhost          = "0.0+cvs20040413"
+PREFERRED_VERSION_xmodmap        = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xrandr         = "0.0+cvs${SRCDATE}"
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index 57afe89ce7..fbecc6e25c 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -20,6 +20,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
 
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
index c8be696358..184258c8b6 100644
--- a/conf/machine/include/zaurus-clamshell-2.4.conf
+++ b/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -11,7 +11,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
 pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
-wpa-supplicant ppp ppp-dialin openswan"
+wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 # Misc Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index aa840586a6..d3882b7f65 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -2,10 +2,11 @@
 # Don't forget to include zaurus-clamshell.conf as well
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
 
 # Ethernet modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 6c857b6bb9..2238f6673e 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
 
 # Ethernet modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_0.9.7.bb
index 1140ce2cf4..597c0ee93d 100644
--- a/packages/apr/apr-util_1.1.2.bb
+++ b/packages/apr/apr-util_0.9.7.bb
@@ -7,17 +7,19 @@ HOMEPAGE = "http://apr.apache.org"
 
 PR = "r0"
 
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+           file://gen_uri_delims.patch;patch=1 \
+           file://uri_delims.h"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
 do_configure() {
+  cp ${S}/../uri_delims.h ${S}/uri/. 
   oe_runconf
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+  oe_libinstall -a -so -C .libs libaprutil-0 ${STAGING_LIBDIR}
 }
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_0.9.7.bb
index ac5d378842..4c236109bb 100644
--- a/packages/apr/apr_1.1.1.bb
+++ b/packages/apr/apr_0.9.7.bb
@@ -6,8 +6,7 @@ HOMEPAGE = "http://apr.apache.org"
 
 PR = "r0"
 
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
 
 inherit autotools lib_package binconfig
 
@@ -16,5 +15,5 @@ do_configure() {
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+  oe_libinstall -a -so -C .libs libapr-0 ${STAGING_LIBDIR}
 }
diff --git a/packages/apr/files/.mtn2git_empty b/packages/apr/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apr/files/.mtn2git_empty
diff --git a/packages/apr/files/gen_uri_delims.patch b/packages/apr/files/gen_uri_delims.patch
new file mode 100644
index 0000000000..57bc15a305
--- /dev/null
+++ b/packages/apr/files/gen_uri_delims.patch
@@ -0,0 +1,7 @@
+--- apr-util-0.9.7/uri/Makefile.in.old	2006-03-11 23:01:09.000000000 +0100
++++ apr-util-0.9.7/uri/Makefile.in	2006-03-11 23:01:28.000000000 +0100
+@@ -15,4 +15,3 @@
+ apr_uri.lo: uri_delims.h apr_uri.c
+ 
+ uri_delims.h: gen_uri_delims
+-	./gen_uri_delims > uri_delims.h
diff --git a/packages/apr/files/uri_delims.h b/packages/apr/files/uri_delims.h
new file mode 100644
index 0000000000..0c855bf726
--- /dev/null
+++ b/packages/apr/files/uri_delims.h
@@ -0,0 +1,16 @@
+/* this file is automatically generated by gen_uri_delims, do not edit */
+static const unsigned char uri_delims[256] = {
+    T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,
+    0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,
+    0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 
+};
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index 4dd40b2157..301ac24cb2 100644
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -18,7 +18,7 @@ inherit autotools update-rc.d
 INITSCRIPT_NAME = "dropbear"
 INITSCRIPT_PARAMS = "defaults 10"
 
-CFLAGS_prepend = "-D_GNU_SOURCE -I. "
+CFLAGS_prepend = " -I. "
 LD = "${CC}"
 
 SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb
index 68c6e87e75..8daf54aac3 100644
--- a/packages/dropbear/dropbear_0.45.bb
+++ b/packages/dropbear/dropbear_0.45.bb
@@ -1,4 +1,4 @@
-require dropbear.inc
+include dropbear.inc
 
 PR = "r4"
 
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index d34787fa64..9aed2dc976 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -1,4 +1,4 @@
-require dropbear.inc
+include dropbear.inc
 
 PR = "r6"
 
diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb
index b8467e1e7c..5990260b87 100644
--- a/packages/dropbear/dropbear_0.47.bb
+++ b/packages/dropbear/dropbear_0.47.bb
@@ -1,3 +1,3 @@
-require dropbear.inc
+include dropbear.inc
 
 PR = "r2"
diff --git a/packages/dropbear/dropbear_0.48.bb b/packages/dropbear/dropbear_0.48.1.bb
index d039209764..d039209764 100644
--- a/packages/dropbear/dropbear_0.48.bb
+++ b/packages/dropbear/dropbear_0.48.1.bb
diff --git a/packages/gnutls/gnutls_1.2.10.bb b/packages/gnutls/gnutls_1.2.10.bb
deleted file mode 100644
index 7227dfdcae..0000000000
--- a/packages/gnutls/gnutls_1.2.10.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "GNU Transport Layer Security Library"
-DEPENDS = "zlib libgcrypt lzo"
-
-LICENSE = "LGPL"
-
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
-
-inherit autotools
-inherit binconfig
-
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
-FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
-FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
-FILES_${PN} = "${libdir}/libgnutls.so.*"
-FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \
-	${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt"
-FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
-
-EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
-
-do_stage() {
-	oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
-	autotools_stage_includes
-}
-
diff --git a/packages/gnutls/gnutls_1.3.4.bb b/packages/gnutls/gnutls_1.3.4.bb
deleted file mode 100644
index 0c02f4bd0f..0000000000
--- a/packages/gnutls/gnutls_1.3.4.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "GNU Transport Layer Security Library"
-DEPENDS = "zlib libgcrypt lzo"
-
-LICENSE = "LGPL"
-
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/devel/gnutls-${PV}.tar.bz2"
-
-inherit autotools
-inherit binconfig
-
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
-FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
-FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
-FILES_${PN} = "${libdir}/libgnutls.so.*"
-FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \
-	${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt"
-FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
-
-EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
-
-do_stage() {
-	oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
-	autotools_stage_includes
-}
-
diff --git a/packages/gpe-todo/gpe-todo.inc b/packages/gpe-todo/gpe-todo.inc
index ab59d565bc..1009f61c44 100644
--- a/packages/gpe-todo/gpe-todo.inc
+++ b/packages/gpe-todo/gpe-todo.inc
@@ -7,5 +7,5 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2"
+SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/gpe-todo/gpe-todo_0.53.bb b/packages/gpe-todo/gpe-todo_0.53.bb
index 3eb0c9d786..c977c69c8d 100644
--- a/packages/gpe-todo/gpe-todo_0.53.bb
+++ b/packages/gpe-todo/gpe-todo_0.53.bb
@@ -7,5 +7,5 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2"
+SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb
deleted file mode 100644
index e797ee75c7..0000000000
--- a/packages/libgcrypt/libgcrypt_1.2.2.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL LGPL FDL"
-DEPENDS = "libgpg-error"
-
-# move libgcrypt-config into -dev package
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
-
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
-
-inherit autotools binconfig
-
-EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
-
-do_stage() {
-	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
-	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
-
-	install -d ${STAGING_INCDIR}/
-	for X in gcrypt.h gcrypt-module.h
-	do
-		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
-	done
-
-}
diff --git a/packages/libtododb/libtododb_0.09.bb b/packages/libtododb/libtododb_0.09.bb
index 36b260f57b..56a9f2cbc3 100644
--- a/packages/libtododb/libtododb_0.09.bb
+++ b/packages/libtododb/libtododb_0.09.bb
@@ -8,7 +8,7 @@ DEPENDS = "libgpewidget libgpepimc sqlite"
 
 inherit pkgconfig gpe autotools
 
-SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2"
+SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 headers = "todo-db.h"
 
 do_stage () {
diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig
index b655e9fd41..e946973747 100644
--- a/packages/linux/ep93xx-kernel/defconfig
+++ b/packages/linux/ep93xx-kernel/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16-rc5
-# Sat Mar 11 13:24:46 2006
+# Sun Mar 12 14:25:46 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -13,6 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
@@ -20,7 +21,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
@@ -112,6 +113,7 @@ CONFIG_ARCH_EP93XX=y
 #
 # Cirrus EP93xx Implementation Options
 #
+CONFIG_CRUNCH=y
 
 #
 # EP93xx Platforms
@@ -153,7 +155,7 @@ CONFIG_ARM_AMBA=y
 #
 # Kernel Features
 #
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -235,7 +237,13 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_IPV6_TUNNEL is not set
 # CONFIG_NETFILTER is not set
 
 #
@@ -288,7 +296,7 @@ CONFIG_TCP_CONG_BIC=y
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 
 #
@@ -402,11 +410,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 
@@ -430,7 +440,7 @@ CONFIG_BLK_DEV_SD=y
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 
@@ -745,11 +755,12 @@ CONFIG_USB_LIBUSUAL=y
 #
 # USB Input Devices
 #
-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=y
 
 #
-# USB HID Boot Protocol drivers
+# Input core support is needed for USB HID input layer or HIDBP support
 #
+CONFIG_USB_HIDDEV=y
 
 #
 # USB Imaging devices
@@ -898,7 +909,11 @@ CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_SECURITY is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1068,6 +1083,7 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
diff --git a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb
index 78630ccb9e..6515a3a2de 100644
--- a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb
+++ b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
   		   http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.16-rc5.bz2;patch=1 \   
-		   http://www.wantstofly.org/~buytenh/ep93xx/derevo15.diff;patch=1 \
+		   http://www.wantstofly.org/~buytenh/ep93xx/derevo16.diff;patch=1 \
            file://defconfig \
 		   "
 
diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb
index e65c21d55d..298553e7bf 100644
--- a/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r11"
+PR = "r12"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -27,17 +27,17 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
-           ${RPSRC}/led_core-r12.patch;patch=1 \
-           ${RPSRC}/led_triggers-r10.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r5.patch;patch=1 \
-           ${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r9.patch;patch=1 \
-           ${RPSRC}/led_locomo-r6.patch;patch=1 \
-           ${RPSRC}/led_ixp4xx-r1.patch;patch=1 \
-           ${RPSRC}/led_tosa-r3.patch;patch=1 \	   
-           ${RPSRC}/led_ide-r3.patch;patch=1 \
-           ${RPSRC}/led_nand-r2.patch;patch=1 \
-           ${RPSRC}/ide_end_request-r0.patch;patch=1 \
+           ${RPSRC}/led_core-r14.patch;patch=1 \
+           ${RPSRC}/led_triggers-r11.patch;patch=1 \
+           ${RPSRC}/led_trig_timer-r6.patch;patch=1 \
+           ${RPSRC}/led_trig_sharpsl_pm-r5a.patch;patch=1 \
+           ${RPSRC}/led_zaurus-r10.patch;patch=1 \
+           ${RPSRC}/led_locomo-r7.patch;patch=1 \
+           ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \
+           ${RPSRC}/led_tosa-r4.patch;patch=1 \	   
+           ${RPSRC}/led_ide-r4a.patch;patch=1 \
+           ${RPSRC}/led_nand-r3.patch;patch=1 \
+           ${RPSRC}/ide_end_request-r1.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/rtc_class-r0.patch;patch=1 \
            ${RPSRC}/rtc_class_pxa-r0.patch;patch=1 \
@@ -82,7 +82,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/pxa-linking-bug.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
-           file://gcc4-ledclass-static-order-hack.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \
@@ -91,8 +90,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            file://defconfig-qemuarm \
            file://defconfig-tosa "
 
-#           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
-
 # Disabled until I find the reason this gives issues with cdc_subset
 #            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
 
diff --git a/packages/python/python-2.4.2-manifest.inc b/packages/python/python-2.4.2-manifest.inc
index 67f10cfff9..da7fc6d28b 100644
--- a/packages/python/python-2.4.2-manifest.inc
+++ b/packages/python/python-2.4.2-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Feb 23 14:35:29 2006
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sun Mar 12 18:58:32 2006
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -11,14 +11,14 @@
 PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml1"
+PR_python-threading="ml2"
 RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="${libdir}/python2.4/bisect.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
+FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
 
-DESCRIPTION_python-distutils="Python Distribution Utility"
-PR_python-distutils="ml1"
+DESCRIPTION_python-distutils="Python Distribution Utilities"
+PR_python-distutils="ml2"
 RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="${libdir}/python2.4/distutils "
+FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml1"
@@ -26,9 +26,9 @@ RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
 FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* "
 
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml1"
+PR_python-codecs="ml2"
 RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/gettext.* ${libdir}/python2.4/xdrlib.* "
+FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml1"
@@ -41,9 +41,9 @@ RDEPENDS_python-datetime="python-core python-codecs"
 FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml1"
+PR_python-core="ml2"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml2"
@@ -126,9 +126,9 @@ RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml1"
-RDEPENDS_python-netclient="python-core python-datetime python-io python-logging python-mime"
-FILES_python-netclient="${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+PR_python-netclient="ml2"
+RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
+FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml1"
diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb
index f065b68112..9424589c7d 100644
--- a/packages/python/python_2.4.2.bb
+++ b/packages/python/python_2.4.2.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
-PR = "ml4"
+PR = "ml5"
 
 PYTHON_MAJMIN = "2.4"
 
diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb
index 7a9cfb1755..e38777ec4e 100644
--- a/packages/subversion/subversion_1.2.0.bb
+++ b/packages/subversion/subversion_1.2.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
-DEPENDS = "apr-util"
+DEPENDS = "apr-util (0.9.7) neon (0.24.7)"
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
@@ -10,7 +10,7 @@ PR = "r0"
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
 	   file://disable-revision-install.patch;patch=1"
 
-EXTRA_OECONF = "--without-neon --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}"
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}"
 
 inherit autotools
 
diff --git a/packages/wpa-supplicant/files/defaults-gnutls b/packages/wpa-supplicant/files/defaults-gnutls
deleted file mode 100644
index 67c4cbddf8..0000000000
--- a/packages/wpa-supplicant/files/defaults-gnutls
+++ /dev/null
@@ -1,8 +0,0 @@
-# Useful flags:
-#  -i <ifname>          Interface (required, unless specified in config)
-#  -D <driver>          Wireless Driver
-#  -d                   Debugging (-dd for more)
-#  -q                   Quiet (-qq for more)
-
-CONFIG="/etc/wpa_supplicant.conf"
-OPTIONS="-i eth1 -D wext"
diff --git a/packages/wpa-supplicant/files/defconfig-gnutls b/packages/wpa-supplicant/files/defconfig-gnutls
deleted file mode 100644
index 2df5e51df8..0000000000
--- a/packages/wpa-supplicant/files/defconfig-gnutls
+++ /dev/null
@@ -1,176 +0,0 @@
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
-# to override previous values of the variables.
-
-CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD
-LIBS = $(TARGET_LDFLAGS)
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=n
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-
-# Driver interface for Prism54 driver
-#CONFIG_DRIVER_PRISM54=y
-
-# Driver interface for ndiswrapper
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for Broadcom driver
-#CONFIG_DRIVER_BROADCOM=y
-
-# Driver interface for Intel ipw2100 driver
-#CONFIG_DRIVER_IPW2100=y
-
-# Driver interface for generic Linux wireless extensions
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5 (automatically included if EAP-TTLS is enabled)
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled)
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Replace native Linux implementation of packet sockets with libdnet/libpcap.
-# This will be automatically set for non-Linux OS.
-#CONFIG_DNET_PCAP=y
-
-# Include control interface for external programs, e.g, wpa_cli
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-#CONFIG_READLINE=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# IEEE 802.11i/IEEE 802.11e STAKey negotiation for direct link connection
-#CONFIG_STAKEY=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
-# none = Empty template
-CONFIG_TLS=gnutls
-
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-CONFIG_GNUTLS_EXTRA=y
-
diff --git a/packages/wpa-supplicant/files/wpa_supplicant.conf-gnutls b/packages/wpa-supplicant/files/wpa_supplicant.conf-gnutls
deleted file mode 100644
index c91ffe0c84..0000000000
--- a/packages/wpa-supplicant/files/wpa_supplicant.conf-gnutls
+++ /dev/null
@@ -1,7 +0,0 @@
-ctrl_interface=/var/run/wpa_supplicant
-ctrl_interface_group=0
-update_config=1
-
-network={
-        key_mgmt=NONE
-}
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
deleted file mode 100644
index 67e5c421ca..0000000000
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
-SECTION = "network"
-LICENSE = "GPL"
-MAINTAINER = "Holger Schurig"
-HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
-DEPENDS = "gnutls"
-PR = "r1"
-
-SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-	file://defconfig-gnutls \
-	file://init.sh \
-	file://defaults-gnutls \
-	file://wpa_supplicant.conf-gnutls"
-
-S = "${WORKDIR}/wpa_supplicant-${PV}"
-
-PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli"
-FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
-FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli"
-
-RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
-
-INITSCRIPT_NAME = "wpa"
-INITSCRIPT_PARAMS = "defaults 10"
-inherit update-rc.d
-
-do_configure () {
-	install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
-}
-
-do_compile () {
-	make
-}
-
-do_install () {
-	install -d ${D}${sbindir}
-	install -m755 wpa_supplicant ${D}${sbindir}
-	install -m755 wpa_passphrase ${D}${sbindir}
-	install -m755 wpa_cli        ${D}${sbindir}
-
-	install -d ${D}${localstatedir}/run/wpa_supplicant
-
-	install -d ${D}${docdir}/wpa_supplicant
-	install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
-
-	install -d ${D}${sysconfdir}/init.d
-	install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
-
-	install -d ${D}${sysconfdir}/default
-	install -m600 ${WORKDIR}/defaults-gnutls ${D}${sysconfdir}/default/wpa
-	install -m600 ${WORKDIR}/wpa_supplicant.conf-gnutls ${D}${sysconfdir}/wpa_supplicant.conf
-}
diff --git a/packages/xcalibrate/xcalibrate/.mtn2git_empty b/packages/xcalibrate/xcalibrate/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xcalibrate/xcalibrate/.mtn2git_empty
diff --git a/packages/xcalibrate/xcalibrate/xextproto.patch b/packages/xcalibrate/xcalibrate/xextproto.patch
new file mode 100644
index 0000000000..cb190c073b
--- /dev/null
+++ b/packages/xcalibrate/xcalibrate/xextproto.patch
@@ -0,0 +1,11 @@
+--- XCalibrate/configure.ac.orig	2006-03-08 14:57:07.000000000 +0100
++++ XCalibrate/configure.ac	2006-03-08 14:57:14.000000000 +0100
+@@ -7,7 +7,7 @@
+ AC_PROG_LIBTOOL
+ 
+ # Check for X
+-PKG_CHECK_MODULES(XCALIBRATE, x11 xextensions xcalibrateext)
++PKG_CHECK_MODULES(XCALIBRATE, x11 xextproto xcalibrateext)
+ 		  
+ AC_OUTPUT([Makefile
+            xcalibrate.pc])
diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb
new file mode 100644
index 0000000000..16e9642765
--- /dev/null
+++ b/packages/xcalibrate/xcalibrate_20060312.bb
@@ -0,0 +1,17 @@
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+LICENSE = "BSD-X"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "libx11 xcalibrateext libxext"
+DESCRIPTION = "XCalibrate client-side library"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
+	   file://xextproto.patch;patch=1"
+S = "${WORKDIR}/XCalibrate"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index ab2b076079..ea69ec6f2d 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -5,7 +5,8 @@ PRIORITY = "optional"
 DEPENDS = "libx11 xcalibrateext libxext"
 DESCRIPTION = "XCalibrate client-side library"
 
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
+	   file://xextproto.patch;patch=1"
 S = "${WORKDIR}/XCalibrate"
 
 inherit autotools pkgconfig 
diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty
diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch
new file mode 100644
index 0000000000..24af21f4fc
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xdpyinfo-1.0.1/configure.ac.orig	2006-03-08 16:33:05.000000000 +0100
++++ xdpyinfo-1.0.1/configure.ac	2006-03-08 16:41:59.000000000 +0100
+@@ -45,11 +45,15 @@
+ 	AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
+ 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+ 
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++        XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(DPY_XKB, x11, 
+ 	[SAVE_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
+ 	AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+ 
+ PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, 
+ 	[SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
new file mode 100644
index 0000000000..41d9807551
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
@@ -0,0 +1,11 @@
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext libxtst"
+DESCRIPTION = "X display information utility"
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xdpyinfo-1.0.1.tar.bz2 \
+	   file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
+
+inherit autotools pkgconfig 
diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb
new file mode 100644
index 0000000000..4f00093a37
--- /dev/null
+++ b/packages/xev/xev_1.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X Event Viewer"
+HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
+LICENSE = "MIT"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+SECTION = "x11/base"
+DEPENDS = "libx11 libxau"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+	   file://diet-x11.patch;patch=1"
+
+inherit autotools
diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb
new file mode 100644
index 0000000000..baacf25564
--- /dev/null
+++ b/packages/xhost/xhost_1.0.0.bb
@@ -0,0 +1,9 @@
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext libxmu"
+DESCRIPTION = "server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig 
diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/xlibs/diet-x11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xlibs/diet-x11/.mtn2git_empty
diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xlibs/diet-x11/X18NCMSstubs.diff
new file mode 100644
index 0000000000..54b1727a95
--- /dev/null
+++ b/packages/xlibs/diet-x11/X18NCMSstubs.diff
@@ -0,0 +1,528 @@
+--- libX11-X11R7.0-1.0.0/src/imConv.c.orig	2006-03-08 09:46:03.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/imConv.c	2006-03-08 10:50:10.000000000 +0100
+@@ -83,6 +83,7 @@
+  * from UCS char to specified charset char.
+  * This converter is needed for _XimGetCharCode subroutine.
+  */
++#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+     _Xconst char*	encoding_name)
+@@ -96,6 +97,7 @@
+     }
+     return cvt;
+ }
++#endif
+ 
+ /*
+  * Returns the locale dependent representation of a keysym.
+@@ -107,6 +109,7 @@
+  * locale
+  */
+ /*ARGSUSED*/
++#ifdef XLOCALE
+ int 
+ _XimGetCharCode (
+     XPointer            ucs_conv,
+@@ -135,6 +138,7 @@
+         buf[count]= '\0';
+     return count;
+ }
++#endif
+ 
+ #ifdef XKB
+ static int lookup_string(
+--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig	2006-03-08 08:43:19.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c	2006-03-08 11:41:28.000000000 +0100
+@@ -0,0 +1,428 @@
++/*
++ * X18NCMSstubs.c
++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
++ *
++ * Copyright � 2003 Matthew Allum
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Matthew Allum not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  Keith Packard and Compaq makes no
++ * representations about the suitability of this software for any purpose.  It
++ * is provided "as is" without express or implied warranty.
++ *
++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, 
++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdlib.h>
++#include "Xlibint.h"
++#include "Xlcint.h"
++#include <X11/Xlocale.h>
++#include <X11/Xos.h>
++#ifdef WIN32
++#undef close
++#endif
++#include <X11/Xutil.h>
++#include "XlcPubI.h"
++
++#include "Xcmsint.h" 		/* for XcmsCCC type  */
++#include "XlcPubI.h"            /* for XLCd type */
++#include "config.h"
++
++#if ! XLOCALE
++
++Bool
++XSupportsLocale()
++{
++  return False; 		
++}
++
++char *
++XSetLocaleModifiers(
++    const char *modifiers)
++{
++  return NULL;
++}
++
++XLCd
++_XOpenLC(
++    char *name)
++{
++  return NULL;
++}
++
++XLCd
++_XlcCurrentLC()
++{
++  return NULL;
++}
++
++void
++_XlcVaToArgList(
++    va_list var,
++    int count,
++    XlcArgList *args_ret)
++{
++  return;
++}
++
++void
++_XlcCountVaList(
++    va_list var,
++    int *count_ret)
++{
++  return;
++}
++
++void
++_XCloseLC(
++    XLCd lcd)
++{
++  return;
++}
++
++int
++_XlcConvert(
++    XlcConv conv,
++    XPointer *from,
++    int *from_left,
++    XPointer *to,
++    int *to_left,
++    XPointer *args,
++    int num_args)
++{
++  return 0;
++}
++
++/* XIM Stubs */
++
++XPointer
++_XimGetLocaleCode ( _Xconst char* encoding_name )
++{
++  return NULL;
++}
++
++int
++_XimGetCharCode (
++    XPointer            ucs_conv,
++    KeySym              keysym,
++    unsigned char*      buf,
++    int                 nbytes)
++{
++  return 0;
++}
++
++/* Xrm Stubs */
++
++XrmMethods
++_XrmInitParseInfo(
++    XPointer *state)
++{
++    return (XrmMethods) NULL;
++}
++
++/* Xwc Stubs */
++
++int
++XwcTextExtents(
++    XFontSet            font_set,
++    _Xconst wchar_t    *text,
++    int                 text_len,
++    XRectangle         *overall_ink_extents,
++    XRectangle         *overall_logical_extents)
++{
++  return 0;
++}
++
++void 
++XwcDrawString(Display *display,
++	      Drawable d,
++	      XFontSet font_set,
++	      GC gc,
++	      int x, int y,
++	      _Xconst wchar_t *string,
++	      int num_wchars)
++{
++  ;
++}
++
++void
++XwcDrawText(
++    Display            *dpy,
++    Drawable            d,
++    GC                  gc,
++    int                 x,
++    int                 y,
++    XwcTextItem        *text_items,
++    int                 nitems)
++{
++  ;
++}
++
++void
++XwcDrawImageString(
++    Display            *dpy,
++    Drawable            d,
++    XFontSet            font_set,
++    GC                  gc,
++    int                 x,
++    int                 y,
++    _Xconst wchar_t    *text,
++    int                 text_len)
++{
++  ;
++}
++
++int
++XwcTextEscapement(
++    XFontSet            font_set,
++    _Xconst wchar_t    *text,
++    int                 text_len)
++{
++  return 0;
++}
++
++Status
++XwcTextPerCharExtents(
++    XFontSet            font_set,
++    _Xconst wchar_t    *text,
++    int                 text_len,
++    XRectangle         *ink_extents_buffer,
++    XRectangle         *logical_extents_buffer,
++    int                 buffer_size,
++    int                *num_chars,
++    XRectangle         *max_ink_extents,
++    XRectangle         *max_logical_extents)
++{
++  ;
++}
++
++int
++XwcTextPropertyToTextList(
++    Display *dpy,
++    const XTextProperty *text_prop,
++    wchar_t ***list_ret,
++    int *count_ret)
++{
++  return 0;
++}
++
++int
++XwcTextListToTextProperty(
++    Display *dpy,
++    wchar_t **list,
++    int count,
++    XICCEncodingStyle style,
++    XTextProperty *text_prop)
++{
++  return 0;
++}
++
++void
++XwcFreeStringList(wchar_t **list)
++{
++  return;
++}
++
++
++void XmbSetWMProperties (        /* Actually from mbWMProps.c */
++    Display *dpy,
++    Window w,
++    _Xconst char *windowName,
++    _Xconst char *iconName,
++    char **argv,
++    int argc,
++    XSizeHints *sizeHints,
++    XWMHints *wmHints,
++    XClassHint *classHints)
++{
++  return;
++}
++
++int
++XmbTextPropertyToTextList(
++    Display *dpy,
++    const XTextProperty *text_prop,
++    char ***list_ret,
++    int *count_ret)
++{
++  return XLocaleNotSupported;
++}
++
++int
++XmbTextListToTextProperty(
++    Display *dpy,
++    char **list,
++    int count,
++    XICCEncodingStyle style,
++    XTextProperty *text_prop)
++{
++  return XLocaleNotSupported;
++}
++
++int
++XmbTextExtents(
++    XFontSet        font_set,
++    _Xconst char   *text,
++    int             text_len,
++    XRectangle     *overall_ink_extents,
++    XRectangle     *overall_logical_extents)
++{
++  return 0;
++}
++
++void
++XmbDrawText(
++    Display            *dpy,
++    Drawable            d,
++    GC                  gc,
++    int                 x,
++    int                 y,
++    XmbTextItem        *text_items,
++    int                 nitems)
++{
++  ;
++}
++
++void
++XmbDrawString(
++    Display            *dpy,
++    Drawable            d,
++    XFontSet            font_set,
++    GC                  gc,
++    int                 x,
++    int                 y,
++    _Xconst char       *text,
++    int                 text_len)
++{
++  ;
++}
++
++void
++XmbDrawImageString(
++    Display            *dpy,
++    Drawable            d,
++    XFontSet            font_set,
++    GC                  gc,
++    int                 x,
++    int                 y,
++    _Xconst char       *text,
++    int                 text_len)
++{
++  ;
++}
++
++int
++XmbTextEscapement(
++    XFontSet        font_set,
++    _Xconst char   *text,
++    int             text_len)
++{
++  return 0;
++}
++
++Status
++XmbTextPerCharExtents(
++    XFontSet        font_set,
++    _Xconst char   *text,
++    int             text_len,
++    XRectangle     *ink_extents_buffer,
++    XRectangle     *logical_extents_buffer,
++    int             buffer_size,
++    int            *num_chars,
++    XRectangle     *max_ink_extents,
++    XRectangle     *max_logical_extents)
++{
++  return 0;
++}
++
++unsigned int
++KeySymToUcs4(KeySym keysym)
++{
++  return 0;
++}
++
++#endif 
++
++#if ! XCMS
++
++XcmsCCC 
++XcmsCCCOfColormap(dpy, cmap)
++    Display *dpy;
++    Colormap cmap;
++{
++  return NULL;
++}
++
++Status
++_XcmsResolveColorString (
++    XcmsCCC ccc,
++    const char **color_string,
++    XcmsColor *pColor_exact_return,
++    XcmsColorFormat result_format)
++{
++  return(XcmsFailure);
++}
++
++void
++_XcmsUnresolveColor(
++    XcmsCCC ccc,
++    XcmsColor *pColor)
++{
++  return;
++}
++
++void
++_XUnresolveColor(
++    XcmsCCC ccc,
++    XColor *pXColor)
++{
++  return;
++}
++
++XcmsCmapRec *
++_XcmsAddCmapRec(dpy, cmap, windowID, visual)
++    Display *dpy;
++    Colormap cmap;
++    Window windowID;
++    Visual *visual;
++{
++  return NULL;
++}
++
++void
++_XcmsRGB_to_XColor(
++    XcmsColor *pColors,
++    XColor *pXColors,
++    unsigned int nColors)
++{
++  return;
++}
++
++XcmsCmapRec *
++_XcmsCopyCmapRecAndFree(
++    Display *dpy,
++    Colormap src_cmap,
++    Colormap copy_cmap)
++{
++  return NULL;
++}
++
++void
++_XcmsDeleteCmapRec(
++    Display *dpy,
++    Colormap cmap)
++{
++  return;
++}
++
++#endif
+--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig	2006-03-08 08:31:09.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Makefile.am	2006-03-08 09:36:23.000000000 +0100
+@@ -331,6 +331,8 @@
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+ 
++libX11_la_SOURCES+=X18NCMSstubs.c
++
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+ 
+@@ -338,7 +340,8 @@
+ 	$(x11data_DATA) \
+ 	os2Stubs.c \
+ 	udcInf.c \
+-	UIThrStubs.c 
++	UIThrStubs.c \
++	X18NCMSstubs.c
+ 
+ #
+ # Figure out which sub-libraries to link into Xlib
+--- libX11-X11R7.0-1.0.0/src/locking.c.orig	2006-03-08 11:05:56.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/locking.c	2006-03-08 11:06:37.000000000 +0100
+@@ -55,7 +55,9 @@
+ #define NUM_FREE_CVLS 4
+ 
+ /* in lcWrap.c */
++#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
++#endif
+ 
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+@@ -625,9 +627,11 @@
+     _Xglobal_lock = &global_lock;
+     xmutex_init(_Xglobal_lock->lock);
+     xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
++#ifdef XLOCALE
+     _Xi18n_lock = &i18n_lock;
+     xmutex_init(_Xi18n_lock->lock);
+     xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
++#endif
+     _XLockMutex_fn = _XLockMutex;
+     _XUnlockMutex_fn = _XUnlockMutex;
+     _XCreateMutex_fn = _XCreateMutex;
+--- libX11-X11R7.0-1.0.0/configure.ac.orig	2006-03-08 10:03:57.000000000 +0100
++++ libX11-X11R7.0-1.0.0/configure.ac	2006-03-08 10:06:01.000000000 +0100
+@@ -215,7 +215,14 @@
+ esac
+ AC_SUBST(KEYSYMDEF)
+ 
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
++AC_ARG_ENABLE(udc,
++              AC_HELP_STRING([--disable-udc],
++                [Disable Xlib support for UDC *EXPERIMENTAL*]),
++              [UDC=$enableval],[UDC=yes])
++AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
++if test x"$UDC" = "xyes"; then
++	AC_DEFINE(UDC,1,[Include support for UDC])
++fi
+ 
+ AC_ARG_ENABLE(xcms, 
+               AC_HELP_STRING([--disable-xcms],
diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xlibs/diet-x11/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..9dbf6dac68
--- /dev/null
+++ b/packages/xlibs/diet-x11/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig	2006-03-12 18:35:42.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Font.c	2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+     }
+     if (l - 2 - (p - charset) < 0)
+ 	return 0;
++#ifdef XLOCALE
+     if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
++#else
++    if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
++#endif
+ 	return 0;
+     if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+ 	return 0;
diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..9f3322c893
--- /dev/null
+++ b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+PROVIDES += "libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+	    file://fix-disable-xlocale.diff;patch=1"
+
+#do_stage_append () {
+#	rm -f ${STAGING_INCDIR}/X11/XKBlib.h
+#}
diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb
new file mode 100644
index 0000000000..3d56bca223
--- /dev/null
+++ b/packages/xlibs/libfontenc_1.0.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..251188b1c2
--- /dev/null
+++ b/packages/xlibs/libice_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libICE-${PV}.tar.bz2"
+S = "${WORKDIR}/libICE-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..14ec6ffac0
--- /dev/null
+++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.0"
+
+DEPENDS = "libx11 libice util-macros"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-1.0.0.tar.bz2"
+S = "${WORKDIR}/libSM-1.0.0"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..d5be287341
--- /dev/null
+++ b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	)
+	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb
new file mode 100644
index 0000000000..828d4ebd3d
--- /dev/null
+++ b/packages/xlibs/libxau_1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..4d3c6acdbd
--- /dev/null
+++ b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXaw-${PV}.tar.bz2"
+S = "${WORKDIR}/libXaw-${PV}"
+
+inherit autotools pkgconfig 
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xlibs/libxcomposite/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xlibs/libxcomposite/.mtn2git_empty
diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xlibs/libxcomposite/change-include-order.patch
new file mode 100644
index 0000000000..630b8818fc
--- /dev/null
+++ b/packages/xlibs/libxcomposite/change-include-order.patch
@@ -0,0 +1,14 @@
+This patch makes the build use its own Xcomposite.h over rather than an
+older Xcomposite.h that might already be installed in the staging dir.
+
+--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig	2006-03-12 20:10:17.000000000 +0100
++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am	2006-03-12 20:10:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ #  PERFORMANCE OF THIS SOFTWARE.
+ 
+-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+ 
+ lib_LTLIBRARIES = libXcomposite.la
+ 
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
new file mode 100644
index 0000000000..57eef74aa3
--- /dev/null
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto xextproto libxfixes"
+PROVIDES = "xcomposite"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
+	   file://change-include-order.patch;patch=1"
+S = "${WORKDIR}/libXcomposite-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb
new file mode 100644
index 0000000000..d20b52d0f0
--- /dev/null
+++ b/packages/xlibs/libxcursor_1.1.5.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcursor-${PV}.tar.bz2"
+S = "${WORKDIR}/libXcursor-${PV}"
+
+FILES_${PN} += "${libdir}/libXcursor.so"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb
new file mode 100644
index 0000000000..572df1d190
--- /dev/null
+++ b/packages/xlibs/libxdamage_1.0.2.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdamage-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdamage-${PV}"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb
new file mode 100644
index 0000000000..4ba746369f
--- /dev/null
+++ b/packages/xlibs/libxdmcp_1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb
index dfc439a9f6..296a741ebf 100644
--- a/packages/xlibs/libxext-native_cvs.bb
+++ b/packages/xlibs/libxext-native_cvs.bb
@@ -2,3 +2,4 @@ SECTION = "unknown"
 include libxext_${PV}.bb
 inherit native
 DEPENDS = "x11-native xextensions-native"
+PROVIDES = ""
diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb
new file mode 100644
index 0000000000..1c15f819b6
--- /dev/null
+++ b/packages/xlibs/libxext_1.0.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 xextproto util-macros"
+PROVIDES = "xext"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXext-${PV}.tar.bz2"
+S = "${WORKDIR}/libXext-${PV}"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb
new file mode 100644
index 0000000000..ea898d723b
--- /dev/null
+++ b/packages/xlibs/libxfixes_3.0.1.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfixes-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfixes-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..9b154a0e9a
--- /dev/null
+++ b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc"
+PROVIDES = "xfont"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfont-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb
new file mode 100644
index 0000000000..d97049d935
--- /dev/null
+++ b/packages/xlibs/libxft_2.1.8.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+PROVIDES = "xft"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXft-${PV}.tar.bz2"
+S = "${WORKDIR}/libXft-${PV}"
+
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	autotools_stage_all
+}
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..e771e60cda
--- /dev/null
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 xextproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXi-${PV}.tar.bz2"
+S = "${WORKDIR}/libXi-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..26b746d465
--- /dev/null
+++ b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Xinerama library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xineramaproto xproto libx11 libxext"
+PROVIDES = "xinerama"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXinerama-${PV}.tar.bz2"
+S = "${WORKDIR}/libXinerama-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb
new file mode 100644
index 0000000000..deae8278c5
--- /dev/null
+++ b/packages/xlibs/libxkbfile_1.0.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb
new file mode 100644
index 0000000000..e404ff527d
--- /dev/null
+++ b/packages/xlibs/libxmu_1.0.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXmu-${PV}.tar.bz2"
+S = "${WORKDIR}/libXmu-${PV}"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb
new file mode 100644
index 0000000000..c8547cf783
--- /dev/null
+++ b/packages/xlibs/libxp_1.0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X print extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xextproto libxau printproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXp-${PV}"
+
+inherit autotools pkgconfig
+
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb
new file mode 100644
index 0000000000..10cf6a6ead
--- /dev/null
+++ b/packages/xlibs/libxpm_3.5.4.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+
+DEPENDS = "xproto libx11 util-macros"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXpm-${PV}.tar.bz2"
+S = "${WORKDIR}/libXpm-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+	oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb
new file mode 100644
index 0000000000..81787ad871
--- /dev/null
+++ b/packages/xlibs/libxrandr_1.1.0.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrandr-${PV}.tar.bz2"
+S = "${WORKDIR}/libXrandr-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb
new file mode 100644
index 0000000000..fdaa9f4eb9
--- /dev/null
+++ b/packages/xlibs/libxrender_0.9.0.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrender-${PV}.tar.bz2"
+S = "${WORKDIR}/libXrender-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..69f20fc8f4
--- /dev/null
+++ b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 xextproto libxext resourceproto"
+PROVIDES = "xres"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXres-${PV}.tar.bz2"
+S = "${WORKDIR}/libXres-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
new file mode 100644
index 0000000000..54abc86a23
--- /dev/null
+++ b/packages/xlibs/libxss_1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X screen saver extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext xextproto scrnsaverproto"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
+S = "${WORKDIR}/libXScrnSaver-${PV}"
+
+inherit autotools pkgconfig
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb
new file mode 100644
index 0000000000..0f9fbf1860
--- /dev/null
+++ b/packages/xlibs/libxt_1.0.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE =  "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros"
+PROVIDES = "xt"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-${PV}.tar.bz2"
+S = "${WORKDIR}/libXt-${PV}"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+	)
+	oe_runmake
+}
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb
new file mode 100644
index 0000000000..89c7b6607a
--- /dev/null
+++ b/packages/xlibs/libxtst_1.0.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Test Extension: client side library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext recordproto xextproto inputproto"
+PROVIDES = "xtst"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXtst-${PV}.tar.bz2"
+S = "${WORKDIR}/libXtst-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..12b480dedc
--- /dev/null
+++ b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Video extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext xextproto videoproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXv-${PV}.tar.bz2"
+S = "${WORKDIR}/libXv-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
new file mode 100644
index 0000000000..9a4824c153
--- /dev/null
+++ b/packages/xlibs/libxxf86dga_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext xxf86dgaproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2"
+S = "${WORKDIR}/libXxf86dga-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
new file mode 100644
index 0000000000..fe67e123d9
--- /dev/null
+++ b/packages/xlibs/libxxf86vm_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xxf86vidmodeproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2"
+S = "${WORKDIR}/libXxf86vm-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb
new file mode 100644
index 0000000000..87e2ecfa62
--- /dev/null
+++ b/packages/xlibs/util-macros_1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb
new file mode 100644
index 0000000000..79503126f2
--- /dev/null
+++ b/packages/xlibs/xtrans_1.0.0.bb
@@ -0,0 +1,13 @@
+LICENSE = "MIT"
+SECTION = "x11/libs"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools  pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb
new file mode 100644
index 0000000000..57140361b4
--- /dev/null
+++ b/packages/xmodmap/xmodmap_1.0.0.bb
@@ -0,0 +1,10 @@
+LICENSE = "MIT"
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+
+DEPENDS = "libx11"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xmodmap-1.0.0.tar.bz2"
+
+inherit autotools pkgconfig 
diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xproto/applewmproto_1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/applewmproto_1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xproto/bigreqsproto_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/bigreqsproto_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xproto/compositeproto_0.2.2.bb
new file mode 100644
index 0000000000..0989abb63c
--- /dev/null
+++ b/packages/xproto/compositeproto_0.2.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "compositeext"
diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xproto/damageproto_1.0.3.bb
new file mode 100644
index 0000000000..cde80f0ffa
--- /dev/null
+++ b/packages/xproto/damageproto_1.0.3.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "damageext"
diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xproto/dmxproto_2.2.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/dmxproto_2.2.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xproto/evieext_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/evieext_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xproto/fixesproto_3.0.2.bb
new file mode 100644
index 0000000000..2be69994a8
--- /dev/null
+++ b/packages/xproto/fixesproto_3.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "fixesext"
diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xproto/fontcacheproto_0.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/fontcacheproto_0.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xproto/fontsproto_2.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/fontsproto_2.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xproto/glproto_1.4.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/glproto_1.4.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xproto/inputproto_1.3.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/inputproto_1.3.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xproto/kbproto_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/kbproto_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xproto/printproto_1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/printproto_1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
new file mode 100644
index 0000000000..4a712a810a
--- /dev/null
+++ b/packages/xproto/proto-common.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xproto/randrproto_1.1.2.bb
new file mode 100644
index 0000000000..fafe3d3bef
--- /dev/null
+++ b/packages/xproto/randrproto_1.1.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "randrext"
diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xproto/recordproto_1.13.2.bb
new file mode 100644
index 0000000000..9e2cafceb8
--- /dev/null
+++ b/packages/xproto/recordproto_1.13.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "recordext"
diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xproto/renderproto_0.9.2.bb
new file mode 100644
index 0000000000..7f9febd8fa
--- /dev/null
+++ b/packages/xproto/renderproto_0.9.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "renderext"
diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xproto/resourceproto_1.0.2.bb
new file mode 100644
index 0000000000..e210b894ee
--- /dev/null
+++ b/packages/xproto/resourceproto_1.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "resourceext"
diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xproto/scrnsaverproto_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/scrnsaverproto_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xproto/trapproto_3.4.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/trapproto_3.4.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xproto/videoproto_2.2.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/videoproto_2.2.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xproto/windowswmproto_1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/windowswmproto_1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xproto/xcmiscproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xcmiscproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xproto/xextproto_7.0.2.bb
new file mode 100644
index 0000000000..1ae2522d5f
--- /dev/null
+++ b/packages/xproto/xextproto_7.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+PROVIDES = "xextensions"
diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xproto/xf86bigfontproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86bigfontproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xproto/xf86dgaproto_2.0.2.bb
new file mode 100644
index 0000000000..3d7166c741
--- /dev/null
+++ b/packages/xproto/xf86dgaproto_2.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "xxf86dgaext"
diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xproto/xf86driproto_2.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86driproto_2.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xproto/xf86miscproto_0.9.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86miscproto_0.9.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xproto/xf86rushproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86rushproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xproto/xf86vidmodeproto_2.2.2.bb
new file mode 100644
index 0000000000..9ce9a207b8
--- /dev/null
+++ b/packages/xproto/xf86vidmodeproto_2.2.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "xxf86vmext"
diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xproto/xineramaproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xineramaproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xproto/xproto_7.0.4.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xproto_7.0.4.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xproto/xproxymanagementprotocol_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xproxymanagementprotocol_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xrandr/xrandr_1.0.1.bb
new file mode 100644
index 0000000000..51f8f1c196
--- /dev/null
+++ b/packages/xrandr/xrandr_1.0.1.bb
@@ -0,0 +1,9 @@
+LICENSE= "BSD-X"
+DEPENDS = "libxrandr libx11 libxext"
+DESCRIPTION = "X Resize and Rotate extension command."
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrandr-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig 
diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xrdb/xrdb_1.0.1.bb
new file mode 100644
index 0000000000..7d6b588dd1
--- /dev/null
+++ b/packages/xrdb/xrdb_1.0.1.bb
@@ -0,0 +1,11 @@
+DEPENDS = "libx11 libxmu libxext"
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+LICENSE = "xrdb"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrdb-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig 
diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
new file mode 100644
index 0000000000..596e498b80
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
@@ -0,0 +1,464 @@
+--- xserver.orig/configure.ac	2006-03-11 16:27:42.000000000 +0100
++++ xserver/configure.ac	2006-03-11 16:46:51.000000000 +0100
+@@ -79,7 +79,7 @@
+ # tslib touchscreen driver
+ AC_CHECK_HEADERS([tslib.h])
+ 
+-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
++REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
+ 
+ DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
+ DEFAULT_VENDOR_STRING="freedesktop.org"
+--- xserver.orig/dix/dispatch.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/dispatch.c	2006-03-11 16:30:59.000000000 +0100
+@@ -79,7 +79,6 @@
+ #endif
+ 
+ #include "windowstr.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "gcstruct.h"
+ #include "selection.h"
+--- xserver.orig/dix/glyphcurs.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/glyphcurs.c	2006-03-11 16:31:57.000000000 +0100
+@@ -51,7 +51,6 @@
+ #include <config.h>
+ #endif
+ #include "misc.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "scrnintstr.h"
+ #include "gcstruct.h"
+--- xserver.orig/dix/main.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/main.c	2006-03-11 16:32:05.000000000 +0100
+@@ -89,7 +89,6 @@
+ #include "colormap.h"
+ #include "colormapst.h"
+ #include "cursorstr.h"
+-#include "font.h"
+ #include "opaque.h"
+ #include "servermd.h"
+ #include "site.h"
+--- xserver.orig/dix/swaprep.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/swaprep.c	2006-03-11 16:32:24.000000000 +0100
+@@ -57,7 +57,7 @@
+ #include <X11/Xproto.h>
+ #include "misc.h"
+ #include "dixstruct.h"
+-#include "fontstruct.h"
++#include "dixfont.h"
+ #include "scrnintstr.h"
+ #include "swaprep.h"
+ #include "globals.h"
+--- xserver.orig/dix/xpstubs.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/xpstubs.c	2006-03-11 16:32:34.000000000 +0100
+@@ -31,7 +31,7 @@
+ #include <config.h>
+ #endif
+ #include "misc.h"
+-#include "font.h"
++#include "dixfont.h"
+ 
+ Bool
+ XpClientIsBitmapClient(ClientPtr client)
+--- xserver.orig/fb/fbglyph.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/fb/fbglyph.c	2006-03-11 16:52:01.000000000 +0100
+@@ -26,7 +26,6 @@
+ #include <config.h>
+ #endif
+ #include "fb.h"
+-#include	"fontstruct.h"
+ #include	"dixfontstr.h"
+       
+ Bool
+--- xserver.orig/hw/kdrive/epson/epson13806draw.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/hw/kdrive/epson/epson13806draw.c	2006-03-11 16:34:56.000000000 +0100
+@@ -38,7 +38,6 @@
+ #include    "pixmapstr.h"
+ #include    "regionstr.h"
+ #include    "mistruct.h"
+-#include    "fontstruct.h"
+ #include    "dixfontstr.h"
+ #include    "fb.h"
+ #include    "migc.h"
+--- xserver.orig/hw/kdrive/i810/i810draw.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/hw/kdrive/i810/i810draw.c	2006-03-11 16:34:41.000000000 +0100
+@@ -51,7 +51,6 @@
+ #include	"pixmapstr.h"
+ #include	"regionstr.h"
+ #include	"mistruct.h"
+-#include	"fontstruct.h"
+ #include	"dixfontstr.h"
+ #include	"fb.h"
+ #include	"migc.h"
+--- xserver.orig/hw/kdrive/src/kaa.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/hw/kdrive/src/kaa.c	2006-03-11 16:35:39.000000000 +0100
+@@ -29,7 +29,6 @@
+ #endif
+ #include "kdrive.h"
+ #include "kaa.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ 
+ #define DEBUG_MIGRATE 0
+--- xserver.orig/include/dixfont.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/include/dixfont.h	2006-03-11 16:43:25.000000000 +0100
+@@ -27,10 +27,10 @@
+ #define DIXFONT_H 1
+ 
+ #include "dix.h"
+-#include "font.h"
+-#include "fontconf.h"
++#include <X11/fonts/font.h>
++#include <X11/fonts/fontconf.h>
+ #include "closure.h"
+-#include "fontstruct.h"
++#include <X11/fonts/fontstruct.h>
+ 
+ #define NullDIXFontProp ((DIXFontPropPtr)0)
+ 
+--- xserver.orig/include/dixfontstr.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/include/dixfontstr.h	2006-03-11 16:43:31.000000000 +0100
+@@ -27,7 +27,6 @@
+ 
+ #include "servermd.h"
+ #include "dixfont.h"
+-#include "fontstruct.h"
+ #include "closure.h"
+ #define NEED_REPLIES
+ #include "X11/Xproto.h" /* for xQueryFontReply */
+--- xserver.orig/mi/mibstore.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/mibstore.c	2006-03-11 16:36:26.000000000 +0100
+@@ -57,7 +57,6 @@
+ #include "gcstruct.h"
+ #include "windowstr.h"
+ #include "pixmapstr.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "dixstruct.h"		/* For requestingClient */
+ #include "mi.h"
+--- xserver.orig/mi/miglblt.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/miglblt.c	2006-03-11 16:53:52.000000000 +0100
+@@ -55,7 +55,6 @@
+ #include	<X11/Xmd.h>
+ #include	<X11/Xproto.h>
+ #include	"misc.h"
+-#include	"fontstruct.h"
+ #include	"dixfontstr.h"
+ #include	"gcstruct.h"
+ #include	"windowstr.h"
+--- xserver.orig/mi/mi.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/mi.h	2006-03-11 16:36:16.000000000 +0100
+@@ -54,7 +54,7 @@
+ #include "validate.h"
+ #include "window.h"
+ #include "gc.h"
+-#include "font.h"
++#include "dixfont.h"
+ #include "input.h"
+ #include "cursor.h"
+ 
+--- xserver.orig/mi/miinitext.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/miinitext.c	2006-03-11 16:36:41.000000000 +0100
+@@ -54,6 +54,8 @@
+ #include "extension.h"
+ #include "micmap.h"
+ #include "xext.h"
++#include "pixmap.h"
++#include "gc.h"
+ 
+ #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
+ #undef PEXEXT
+--- xserver.orig/mi/mipolytext.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/mipolytext.c	2006-03-11 16:36:48.000000000 +0100
+@@ -63,7 +63,6 @@
+ #include	<X11/Xproto.h>
+ #include	"misc.h"
+ #include	"gcstruct.h"
+-#include	"fontstruct.h"
+ #include	"dixfontstr.h"
+ #include	"mi.h"
+ 
+--- xserver.orig/mi/misprite.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/misprite.c	2006-03-11 16:37:00.000000000 +0100
+@@ -42,7 +42,6 @@
+ # include   "input.h"
+ # include   "mi.h"
+ # include   "cursorstr.h"
+-# include   "font.h"
+ # include   "scrnintstr.h"
+ # include   "colormapst.h"
+ # include   "windowstr.h"
+@@ -50,7 +49,6 @@
+ # include   "mipointer.h"
+ # include   "mispritest.h"
+ # include   "dixfontstr.h"
+-# include   "fontstruct.h"
+ #ifdef RENDER
+ # include   "mipict.h"
+ #endif
+--- xserver.orig/miext/damage/damage.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/damage/damage.c	2006-03-11 16:37:17.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shadow.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shadow.c	2006-03-11 16:38:13.000000000 +0100
+@@ -29,9 +29,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shalloc.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shalloc.c	2006-03-11 16:38:25.000000000 +0100
+@@ -29,9 +29,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shpacked.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shpacked.c	2006-03-11 16:38:33.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shplanar8.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shplanar8.c	2006-03-11 16:38:44.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shplanar.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shplanar.c	2006-03-11 16:38:39.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shrotate.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shrotate.c	2006-03-11 16:38:56.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shrotpack.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shrotpack.h	2006-03-11 16:39:02.000000000 +0100
+@@ -30,9 +30,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/miext/shadow/shrotpackYX.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shrotpackYX.h	2006-03-11 16:39:08.000000000 +0100
+@@ -25,9 +25,7 @@
+ #include    <X11/X.h>
+ #include    "scrnintstr.h"
+ #include    "windowstr.h"
+-#include    "font.h"
+ #include    "dixfontstr.h"
+-#include    "fontstruct.h"
+ #include    "mi.h"
+ #include    "regionstr.h"
+ #include    "globals.h"
+--- xserver.orig/os/xstrans.c	2006-03-11 16:27:42.000000000 +0100
++++ xserver/os/xstrans.c	2006-03-11 16:39:31.000000000 +0100
+@@ -27,4 +27,4 @@
+ 
+ #include "config.h"
+ 
+-#include <transport.c>
++#include <X11/Xtrans/transport.c>
+--- xserver.orig/os/xstrans.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/os/xstrans.h	2006-03-11 16:39:37.000000000 +0100
+@@ -25,4 +25,4 @@
+ #define XSERV_t
+ #define TRANS_SERVER
+ 
+-#include <Xtrans.h>
++#include <X11/Xtrans/Xtrans.h>
+--- xserver.orig/Xext/shmint.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/Xext/shmint.h	2006-03-11 16:29:24.000000000 +0100
+@@ -32,27 +32,6 @@
+ #include "pixmap.h"
+ #include "gc.h"
+ 
+-typedef struct _ShmFuncs {
+-    PixmapPtr	(* CreatePixmap)(ScreenPtr	pScreen,
+-				 int		width,
+-				 int		height,
+-				 int		depth,
+-				 char		*addr);
+-    void	(* PutImage)(DrawablePtr	dst,
+-			     GCPtr		pGC,
+-			     int		depth,
+-			     unsigned int	format,
+-			     int		w,
+-			     int		h,
+-			     int	    	sx,
+-			     int	    	sy,
+-			     int	    	sw,
+-			     int	    	sh,
+-			     int	    	dx,
+-			     int	    	dy,
+-			     char		*data);
+-} ShmFuncs, *ShmFuncsPtr;
+-
+ void
+ ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+ 
+--- xserver.orig/Xext/syncint.h	2006-03-11 16:27:42.000000000 +0100
++++ xserver/Xext/syncint.h	2006-03-11 16:30:16.000000000 +0100
+@@ -48,7 +48,7 @@
+ PERFORMANCE OF THIS SOFTWARE.
+ 
+ ******************************************************************/
+-/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */
++/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */
+ 
+ #ifndef _SYNCINT_H_
+ #define _SYNCINT_H_
+@@ -57,26 +57,10 @@
+ 
+ #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
+ 
+-typedef struct _SyncCounter {
+-    ClientPtr		client;	/* Owning client. 0 for system counters */
+-    XSyncCounter	id;		/* resource ID */
+-    CARD64		value;		/* counter value */
+-    struct _SyncTriggerList *pTriglist;	/* list of triggers */
+-    Bool		beingDestroyed; /* in process of going away */
+-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
+-} SyncCounter;
+-
+ /*
+  * The System Counter interface
+  */
+ 
+-typedef enum {
+-    XSyncCounterNeverChanges,
+-    XSyncCounterNeverIncreases,
+-    XSyncCounterNeverDecreases,
+-    XSyncCounterUnrestricted
+-} SyncCounterType;
+-
+ typedef void
+ (*SyncQueryValueProcPtr) (pointer pCounter,
+ 			  CARD64 *freshvalue);
+@@ -86,16 +70,6 @@
+ 			     CARD64 *lessthan,
+ 			     CARD64 *greaterthan);
+ 
+-typedef struct _SysCounterInfo {
+-    char			*name;
+-    CARD64			resolution;
+-    CARD64			bracket_greater;
+-    CARD64			bracket_less;
+-    SyncCounterType		counterType;  /* how can this counter change */
+-    SyncQueryValueProcPtr	QueryValue;
+-    SyncBracketValuesProcPtr	BracketValues;
+-} SysCounterInfo;
+-
+ struct _SyncTrigger;
+ 
+ typedef Bool
+@@ -108,55 +82,6 @@
+ typedef void
+ (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger);
+ 
+-typedef struct _SyncTrigger {
+-    SyncCounter			*pCounter;
+-    CARD64			wait_value;	/* wait value */
+-    unsigned int		value_type;     /* Absolute or Relative */
+-    unsigned int		test_type;	/* transition or Comparision type */
+-    CARD64			test_value;	/* trigger event threshold value */
+-    SyncCheckTriggerProcPtr	CheckTrigger;
+-    SyncTriggerFiredProcPtr	TriggerFired;
+-    SyncCounterDestroyedProcPtr	CounterDestroyed;
+-} SyncTrigger;
+-
+-typedef struct _SyncTriggerList {
+-    SyncTrigger			*pTrigger;
+-    struct _SyncTriggerList	*next;
+-} SyncTriggerList;
+-
+-typedef struct _SyncAlarmClientList {
+-    ClientPtr			client;
+-    XID				delete_id;
+-    struct _SyncAlarmClientList *next;
+-} SyncAlarmClientList;
+-
+-typedef struct _SyncAlarm {
+-    SyncTrigger			trigger;
+-    ClientPtr			client;
+-    XSyncAlarm			alarm_id;
+-    CARD64			delta;
+-    int				events;
+-    int				state;
+-    SyncAlarmClientList		*pEventClients;
+-} SyncAlarm;
+-
+-typedef struct {
+-    ClientPtr	client;
+-    CARD32 	delete_id;
+-    int		num_waitconditions;
+-} SyncAwaitHeader;
+-
+-typedef struct {
+-    SyncTrigger trigger;
+-    CARD64	event_threshold;
+-    SyncAwaitHeader *pHeader;
+-} SyncAwait;
+-
+-typedef union {
+-    SyncAwaitHeader header;
+-    SyncAwait	    await;
+-} SyncAwaitUnion;
+-
+ pointer
+ SyncCreateSystemCounter(char			    *name,
+ 			CARD64			    inital_value,
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index e0db6be3e7..73d57e93e1 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -4,6 +4,11 @@ DEFAULT_PREFERENCE = "1"
 
 LICENSE = "MIT"
 DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+
+# Uncomment the following DEPENDS line and the commented line in SRC_URI
+# to make this snapshot build against X11R7.0 xlibs.
+#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
+
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
 PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
@@ -34,6 +39,7 @@ FILES_xserver-kdrive-epson = "${bindir}/Xepson"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
+#	file://build-20050207-against-X11R7.diff;patch=1 \
 	file://kmode.patch;patch=1 \
 	file://disable-apm.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1 "
diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xserver/xserver-kdrive_20060312.bb
new file mode 100644
index 0000000000..9c763dbfed
--- /dev/null
+++ b/packages/xserver/xserver-kdrive_20060312.bb
@@ -0,0 +1,52 @@
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+DEFAULT_PREFERENCE = "1"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
+DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
+DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
+DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
+DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
+DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+PR = "r11"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-ati = "${bindir}/Xati"
+FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
+FILES_xserver-kdrive-via = "${bindir}/Xvia"
+FILES_xserver-kdrive-mga = "${bindir}/Xmga"
+FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
+	file://kmode.patch;patch=1 \
+	file://disable-apm.patch;patch=1 \
+	file://no-serial-probing.patch;patch=1 \
+	file://kdrive-evdev.patch;patch=1  \
+	file://kdrive-use-evdev.patch;patch=1  \
+	file://fbdev-not-fix.patch;patch=1"
+
+SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/xserver"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index b891bca467..f049c8cae0 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
 LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
 PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
@@ -34,6 +34,7 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
 	file://kmode.patch;patch=1 \
+	file://disable-apm.patch;patch=1 \
 	file://no-serial-probing.patch;patch=1 \
 	file://kdrive-evdev.patch;patch=1  \
 	file://kdrive-use-evdev.patch;patch=1  \
diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xset/xset/disable-xkb.patch
new file mode 100644
index 0000000000..6060fbb995
--- /dev/null
+++ b/packages/xset/xset/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xset-1.0.1/configure.ac.orig	2006-03-08 19:46:59.000000000 +0100
++++ xset-1.0.1/configure.ac	2006-03-08 19:47:40.000000000 +0100
+@@ -42,11 +42,15 @@
+ 	AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
+ 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+ 
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++        XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(SET_XKB, x11, 
+ 	[SAVE_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
+ 	AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+ 
+ PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, 
+ 	[SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb
new file mode 100644
index 0000000000..793e6d420b
--- /dev/null
+++ b/packages/xset/xset_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DEPENDS = "libx11 libxext xextproto libxmu"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+	   file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
+
+inherit autotools pkgconfig
author	Oyvind Repvik <nail@nslu2-linux.org>	2006-03-14 22:34:13 +0000
committer	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>	2006-03-14 22:34:13 +0000
commit	9e47d0f0ad0f9903550c50fdb59f773ee0b76ab6 (patch)
tree	fc2e025013c14d1d55bceeb3f8dbea310e9dab46
parent	9673c57c71bd1b4ea8ab4736d5732134f2f4de7d (diff)
parent	ea6a78777bc9c0a961cd79730da2561c34089362 (diff)