86 files changed, 120 insertions, 94 deletions
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index 1d40bbac56..ab367378af 100644
--- a/openembedded/conf/distro/familiar-unstable.conf
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -1,7 +1,6 @@
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
 DISTRO_VERSION = "unstable-${DATE}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 # Do not touch this file before notifying familiar-dev@handhelds.org
 include conf/distro/familiar.conf
@@ -13,8 +12,12 @@ DISTRO_TYPE = "debug"
 FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
+    base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-        updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
+        ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+        updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \
+        locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \
+        locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \
+        locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de"
 #SRCDATE = 20050331
 #SRCDATE = "now"
@@ -25,7 +28,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDER_virtual/libiconv=glibc
 PREFERRED_PROVIDER_virtual/libintl=glibc
-PREFERRED_PROVIDER_x11=diet-x11
 PREFERRED_VERSION_hostap-modules ?= "0.3.9"
@@ -46,6 +48,12 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 #
+# PIN the familiar build to a version
+#
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
+#
 # Opie
 #
@@ -61,7 +69,7 @@ PREFERRED_VERSION_qte = "2.3.10"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 include conf/distro/preferred-gpe-versions-2.8.inc
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf
index 99e501589f..da5caa7998 100644
--- a/openembedded/conf/distro/familiar.conf
+++ b/openembedded/conf/distro/familiar.conf
@@ -2,14 +2,17 @@
 #@NAME: Familiar Linux
 #@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
+MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
 INHERIT += "package_ipk debian"
 TARGET_OS = "linux"
-PARALLEL_INSTALL_MODULES = "1"
+BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
-UDEV_DEVFS_RULES = "1"
 IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+PARALLEL_INSTALL_MODULES = "1"
+UDEV_DEVFS_RULES = "1"
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf
index f83e4b1d96..d30ecc9084 100644
--- a/openembedded/conf/distro/maemo-1.0.conf
+++ b/openembedded/conf/distro/maemo-1.0.conf
@@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 include conf/distro/preferred-gpe-versions.inc
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
index f424b16696..1143f1d940 100644
--- a/openembedded/conf/distro/openzaurus-unstable.conf
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -57,7 +57,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 # GPE
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 include conf/distro/preferred-gpe-versions-2.8.inc
 #
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index ab115ac292..d734b64cdd 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -55,7 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDER_virtual/libiconv ?= glibc
 PREFERRED_PROVIDER_virtual/libintl ?= glibc
 PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
-PREFERRED_PROVIDER_x11 ?= "diet-x11"
+PREFERRED_PROVIDER_libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_gconf ?= gconf-dbus
 PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
@@ -89,7 +89,7 @@ SRCDATE_matchbox-themes-extra ?= "20051101"
 SRCDATE_matchbox-wm ?= "20060120"
 SRCDATE_libmatchbox ?= "20060120"
 SRCDATE_tslib ?= "20051101"
-SRCDATE_xext ?= "20051101"
+SRCDATE_libxext ?= "20051101"
 SRCDATE_renderext ?= "20051101"
 SRCDATE_libxrender ?= "20051101"
 SRCDATE_fixesext ?= "20051101"
@@ -99,10 +99,10 @@ SRCDATE_xcalibrateext ?= "20051101"
 SRCDATE_recordext ?= "20051101"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_xmodmap ?= "20051101"
-SRCDATE_xrandr ?= "20051101"
+SRCDATE_libxrandr ?= "20051101"
-SRCDATE_xtst ?= "20051101"
+SRCDATE_libxtst ?= "20051101"
-SRCDATE_xcalibrate ?= "20051101"
+SRCDATE_libxcalibrate ?= "20051101"
-SRCDATE_xmu ?= "20051115"
+SRCDATE_libxmu ?= "20051115"
 SRCDATE_xdpyinfo ?= "20051115"
 SRCDATE_xauth ?= "20060120"
diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf
index 320361398e..57ca4fe237 100644
--- a/openembedded/conf/documentation.conf
+++ b/openembedded/conf/documentation.conf
@@ -90,3 +90,4 @@ T[doc]       = "Temporary directory within the WORKDIR."
 GROUP_locale[doc] = "Locale generation of the GNU libc implementation"
 ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale"
+PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)."
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 3d6b7c0c3d..41c485c019 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te nokia770"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index e1cb468d8f..212da52587 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -7,7 +7,7 @@ KERNEL_VERSION ?= "2.6"
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 # Useful things for the built-in Harddisk
diff --git a/openembedded/packages/cairo/cairo_1.0.0.bb b/openembedded/packages/cairo/cairo_1.0.0.bb
index 84cb581174..10603e3f2f 100644
--- a/openembedded/packages/cairo/cairo_1.0.0.bb
+++ b/openembedded/packages/cairo/cairo_1.0.0.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11 libpng fontconfig libxrender"
+DEPENDS = "libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 PR = "r1"
diff --git a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index fbebed2e45..e2065b3faa 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r1"
 S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/"
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb
index 260a03684e..b276072310 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb
@@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r4"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/openembedded/packages/gtk+/gtk+_2.8.16.bb b/openembedded/packages/gtk+/gtk+_2.8.16.bb
index 875efa8d39..acd3be5f27 100644
--- a/openembedded/packages/gtk+/gtk+_2.8.16.bb
+++ b/openembedded/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
 PR = "r2"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
diff --git a/openembedded/packages/libfakekey/libfakekey_svn.bb b/openembedded/packages/libfakekey/libfakekey_svn.bb
index 7cdd557463..eec4d6506d 100644
--- a/openembedded/packages/libfakekey/libfakekey_svn.bb
+++ b/openembedded/packages/libfakekey/libfakekey_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
-DEPENDS = "xtst"
+DEPENDS = "libxtst"
 SECTION = "x11/wm"
 PR="r1"
 PV = "0.0+svn${SRCDATE}"
diff --git a/openembedded/packages/libmatchbox/libmatchbox.inc b/openembedded/packages/libmatchbox/libmatchbox.inc
index e8700cb7b6..974014f276 100644
--- a/openembedded/packages/libmatchbox/libmatchbox.inc
+++ b/openembedded/packages/libmatchbox/libmatchbox.inc
@@ -1,7 +1,7 @@
 SECTION = "x11/libs"
 DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
-DEPENDS = "x11 xext expat libxft jpeg libpng zlib libxsettings-client"
+DEPENDS = "libx11 libxext expat libxft jpeg libpng zlib libxsettings-client"
 PR="r2"
 inherit autotools pkgconfig
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
index 1ccb6e4eb6..7e1b4df2c4 100644
--- a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,7 +1,7 @@
 SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
-DEPENDS = "libxsettings x11"
+DEPENDS = "libxsettings libx11"
 PR = "r1"
 inherit autotools pkgconfig gpe
diff --git a/openembedded/packages/libxsettings/libxsettings_0.11.bb b/openembedded/packages/libxsettings/libxsettings_0.11.bb
index 6ff786e3bd..caf2bc67ae 100644
--- a/openembedded/packages/libxsettings/libxsettings_0.11.bb
+++ b/openembedded/packages/libxsettings/libxsettings_0.11.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
 inherit gpe
diff --git a/openembedded/packages/lirc/lirc_0.7.1.bb b/openembedded/packages/lirc/lirc_0.7.1.bb
index c3eaa3aa87..cd65dcedae 100644
--- a/openembedded/packages/lirc/lirc_0.7.1.bb
+++ b/openembedded/packages/lirc/lirc_0.7.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel x11 xau libsm ice"
+DEPENDS = "virtual/kernel libx11 libxau libsm libice"
 PR = "r5"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
diff --git a/openembedded/packages/maemo/xpext_1.0-5.bb b/openembedded/packages/maemo/xpext_1.0-5.bb
index cd5aec2d13..75b7903e84 100644
--- a/openembedded/packages/maemo/xpext_1.0-5.bb
+++ b/openembedded/packages/maemo/xpext_1.0-5.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext"
+DEPENDS = "libx11 xextensions libxext"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
           file://auxdir.patch;patch=1;pnum=0"
diff --git a/openembedded/packages/maemo/xsp_1.0.0-8.bb b/openembedded/packages/maemo/xsp_1.0.0-8.bb
index 0c4a4c62f8..068193c6aa 100644
--- a/openembedded/packages/maemo/xsp_1.0.0-8.bb
+++ b/openembedded/packages/maemo/xsp_1.0.0-8.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext xpext"
+DEPENDS = "libx11 xextensions libxext xpext"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
 S = "${WORKDIR}/Xsp"
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel.inc b/openembedded/packages/matchbox-panel/matchbox-panel.inc
index 7ae9342b42..d5d3551619 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel.inc
+++ b/openembedded/packages/matchbox-panel/matchbox-panel.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 inherit autotools pkgconfig gettext
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index 69bddc3544..c158f590ce 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 PR="r0"
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
index c9e7ada22d..ad37976dd4 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext libxrender startup-notification expat matchbox-common gconf"
+DEPENDS = "libmatchbox libx11 libxext libxrender startup-notification expat matchbox-common gconf"
 RDEPENDS = "matchbox-common"
 PV = "0.9.5+svn${SRCDATE}"
 PR = "r4"
diff --git a/openembedded/packages/pango/pango_1.10.0.bb b/openembedded/packages/pango/pango_1.10.0.bb
index dda4df2fda..869b146d56 100644
--- a/openembedded/packages/pango/pango_1.10.0.bb
+++ b/openembedded/packages/pango/pango_1.10.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/openembedded/packages/pango/pango_1.12.0.bb b/openembedded/packages/pango/pango_1.12.0.bb
index 4b6459e034..e06e659b7b 100644
--- a/openembedded/packages/pango/pango_1.12.0.bb
+++ b/openembedded/packages/pango/pango_1.12.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/openembedded/packages/pango/pango_1.9.1.bb b/openembedded/packages/pango/pango_1.9.1.bb
index e66b65f367..db01079fe1 100644
--- a/openembedded/packages/pango/pango_1.9.1.bb
+++ b/openembedded/packages/pango/pango_1.9.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 2f3f56c2cc..b224bb0c9d 100644
--- a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
 DESCRIPTION = "rxvt-unicode is a clone of the well known \
 terminal emulator rxvt, modified to store text in Unicode \
 (either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/openembedded/packages/startup-notification/startup-notification_0.8.bb b/openembedded/packages/startup-notification/startup-notification_0.8.bb
index a505a53960..3db849d2ce 100644
--- a/openembedded/packages/startup-notification/startup-notification_0.8.bb
+++ b/openembedded/packages/startup-notification/startup-notification_0.8.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
 PR = "r1"
 inherit autotools pkgconfig 
diff --git a/openembedded/packages/x11/x11-native_6.2.1.bb b/openembedded/packages/x11/x11-native_6.2.1.bb
deleted file mode 100644
index cb44531b87..0000000000
--- a/openembedded/packages/x11/x11-native_6.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "x11/base"
-include x11_${PV}.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
diff --git a/openembedded/packages/xauth/xauth_cvs.bb b/openembedded/packages/xauth/xauth_cvs.bb
index 1243fce1d8..54700574b7 100644
--- a/openembedded/packages/xauth/xauth_cvs.bb
+++ b/openembedded/packages/xauth/xauth_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "x11 xau xmu xext"
+DEPENDS = "libx11 libxau libxmu libxext"
 DESCRIPTION = "X authority file utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
diff --git a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
index e254348e4f..ab2b076079 100644
--- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "x11 xcalibrateext xext"
+DEPENDS = "libx11 xcalibrateext libxext"
 DESCRIPTION = "XCalibrate client-side library"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
diff --git a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
index bd1047c63e..eb63ae7f4d 100644
--- a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "x11 xext xtst"
+DEPENDS = "libx11 libxext libxtst"
 DESCRIPTION = "X display information utility"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
diff --git a/openembedded/packages/xhost/xhost_20040413.bb b/openembedded/packages/xhost/xhost_20040413.bb
index b3ca3c939c..4d36e62bee 100644
--- a/openembedded/packages/xhost/xhost_20040413.bb
+++ b/openembedded/packages/xhost/xhost_20040413.bb
@@ -1,7 +1,7 @@
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 LICENSE = "MIT"
 PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "x11 xext xmu"
+DEPENDS = "libx11 libxext libxmu"
 DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
diff --git a/openembedded/packages/x11/diet-x11_6.2.1.bb b/openembedded/packages/xlibs/diet-x11_6.2.1.bb
index 1313bd08d0..284fcc21cc 100644
--- a/openembedded/packages/x11/diet-x11_6.2.1.bb
+++ b/openembedded/packages/xlibs/diet-x11_6.2.1.bb
@@ -1,8 +1,10 @@
 SECTION = "x11/base"
-include x11_${PV}.bb
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+include libx11_${PV}.bb
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/openembedded/packages/xlibs/ice/autofoo.patch b/openembedded/packages/xlibs/libice/autofoo.patch
index 8ab0585fb8..8ab0585fb8 100644
--- a/openembedded/packages/xlibs/ice/autofoo.patch
+++ b/openembedded/packages/xlibs/libice/autofoo.patch
diff --git a/openembedded/packages/xlibs/ice_6.3.3.bb b/openembedded/packages/xlibs/libice_6.3.3.bb
index 7722bc4ae5..1311145334 100644
--- a/openembedded/packages/xlibs/ice_6.3.3.bb
+++ b/openembedded/packages/xlibs/libice_6.3.3.bb
@@ -2,7 +2,8 @@ SECTION = "libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
+PROVIDES = "ice"
 DESCRIPTION = "X11 ICE library"
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libsm_6.0.3.bb b/openembedded/packages/xlibs/libsm_6.0.3.bb
index 6a85eaf6cc..08f9597045 100644
--- a/openembedded/packages/xlibs/libsm_6.0.3.bb
+++ b/openembedded/packages/xlibs/libsm_6.0.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "MIT-X"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 ice"
+DEPENDS = "libx11 libice"
 DESCRIPTION = "Session management library"
 PR = "r1"
@@ -13,5 +13,5 @@ S = "${WORKDIR}/libSM-${PV}"
 inherit autotools pkgconfig 
 do_stage () {
-        oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+        autotools_stage_all
 }
diff --git a/openembedded/packages/xlibs/libx11-native_6.2.1.bb b/openembedded/packages/xlibs/libx11-native_6.2.1.bb
new file mode 100644
index 0000000000..9513c4237e
--- /dev/null
+++ b/openembedded/packages/xlibs/libx11-native_6.2.1.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+include libx11_${PV}.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/openembedded/packages/x11/files/autofoo.patch b/openembedded/packages/xlibs/libx11/autofoo.patch
index 8bdba09768..8bdba09768 100644
--- a/openembedded/packages/x11/files/autofoo.patch
+++ b/openembedded/packages/xlibs/libx11/autofoo.patch
diff --git a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
index f43d38065e..f43d38065e 100644
--- a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch
+++ b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
diff --git a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch
+++ b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch
diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/xlibs/libx11_6.2.1.bb
index 121c1ddd9e..901746bafa 100644
--- a/openembedded/packages/x11/x11_6.2.1.bb
+++ b/openembedded/packages/xlibs/libx11_6.2.1.bb
@@ -2,12 +2,12 @@ SECTION = "x11/libs"
 LICENSE = "XFree86"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "x11"
 DESCRIPTION = "Base X libs."
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
-PROVIDES = "x11"
+PR = "r4"
-PR = "r3"
 SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
           file://errordb-keysymdb-path-fix.patch;patch=1 \
diff --git a/openembedded/packages/xlibs/xau-native_cvs.bb b/openembedded/packages/xlibs/libxau-native_0.1.1.bb
index ac8b19c749..ecb71ce3d6 100644
--- a/openembedded/packages/xlibs/xau-native_cvs.bb
+++ b/openembedded/packages/xlibs/libxau-native_0.1.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include xau_cvs.bb
+include libxau_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
diff --git a/openembedded/packages/xlibs/xau-native_0.1.1.bb b/openembedded/packages/xlibs/libxau-native_cvs.bb
index e4d62da929..cd070033ce 100644
--- a/openembedded/packages/xlibs/xau-native_0.1.1.bb
+++ b/openembedded/packages/xlibs/libxau-native_cvs.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include xau_${PV}.bb
+include libxau_cvs.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
diff --git a/openembedded/packages/xlibs/xau/autofoo.patch b/openembedded/packages/xlibs/libxau/autofoo.patch
index 1e42eb974d..1e42eb974d 100644
--- a/openembedded/packages/xlibs/xau/autofoo.patch
+++ b/openembedded/packages/xlibs/libxau/autofoo.patch
diff --git a/openembedded/packages/xlibs/xau_0.1.1.bb b/openembedded/packages/xlibs/libxau_0.1.1.bb
index 3c8b4a030b..dc1a28171b 100644
--- a/openembedded/packages/xlibs/xau_0.1.1.bb
+++ b/openembedded/packages/xlibs/libxau_0.1.1.bb
@@ -3,6 +3,7 @@ LICENSE= "MIT"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
+PROVIDES = "xau"
 DESCRIPTION = "Authorization Protocol for X."
 PR = "r1"
diff --git a/openembedded/packages/xlibs/xau_cvs.bb b/openembedded/packages/xlibs/libxau_cvs.bb
index a0e2bd312f..518744816d 100644
--- a/openembedded/packages/xlibs/xau_cvs.bb
+++ b/openembedded/packages/xlibs/libxau_cvs.bb
@@ -5,6 +5,7 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
+PROVIDES = "xau"
 DESCRIPTION = "Authorization Protocol for X."
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
diff --git a/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch b/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
index 072cf25214..072cf25214 100644
--- a/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch
+++ b/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
diff --git a/openembedded/packages/xlibs/xcomposite_1.0.1.bb b/openembedded/packages/xlibs/libxcomposite_1.0.1.bb
index 1e8d96ce2e..e2ca3bbc7b 100644
--- a/openembedded/packages/xlibs/xcomposite_1.0.1.bb
+++ b/openembedded/packages/xlibs/libxcomposite_1.0.1.bb
@@ -1,6 +1,7 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "x11 compositeext xextensions libxfixes"
+DEPENDS = "libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."
 PR = "r1"
@@ -11,9 +12,5 @@ S = "${WORKDIR}/libXcomposite-${PV}"
 inherit autotools pkgconfig 
 do_stage() {
-        oe_runmake install prefix=${STAGING_DIR} \
+        autotools_stage_all
-               bindir=${STAGING_BINDIR} \
-               includedir=${STAGING_INCDIR} \
-               libdir=${STAGING_LIBDIR} \
-               datadir=${STAGING_DATADIR}
 }
diff --git a/openembedded/packages/xlibs/xcomposite_cvs.bb b/openembedded/packages/xlibs/libxcomposite_cvs.bb
index c2ec718cd6..1d8b69c8c6 100644
--- a/openembedded/packages/xlibs/xcomposite_cvs.bb
+++ b/openembedded/packages/xlibs/libxcomposite_cvs.bb
@@ -1,7 +1,8 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 compositeext xextensions libxfixes"
+DEPENDS = "libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
diff --git a/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch b/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch
index 1e3ec45d4a..1e3ec45d4a 100644
--- a/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch
+++ b/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch
diff --git a/openembedded/packages/xlibs/xdamage/m4.patch b/openembedded/packages/xlibs/libxdamage/m4.patch
index 393f3d13d2..393f3d13d2 100644
--- a/openembedded/packages/xlibs/xdamage/m4.patch
+++ b/openembedded/packages/xlibs/libxdamage/m4.patch
diff --git a/openembedded/packages/xlibs/xdamage_1.0.1.bb b/openembedded/packages/xlibs/libxdamage_1.0.1.bb
index 5b6c301374..040e863447 100644
--- a/openembedded/packages/xlibs/xdamage_1.0.1.bb
+++ b/openembedded/packages/xlibs/libxdamage_1.0.1.bb
@@ -1,6 +1,7 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "x11 damageext libxfixes xproto"
+DEPENDS = "libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
 DESCRIPTION = "X Damage extension library."
 PR = "r1"
diff --git a/openembedded/packages/xlibs/xdamage_cvs.bb b/openembedded/packages/xlibs/libxdamage_cvs.bb
index d7d9e33f8d..ba8a68033a 100644
--- a/openembedded/packages/xlibs/xdamage_cvs.bb
+++ b/openembedded/packages/xlibs/libxdamage_cvs.bb
@@ -1,7 +1,8 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 damageext libxfixes xproto"
+DEPENDS = "libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
 DESCRIPTION = "X Damage extension library."
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
diff --git a/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb b/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb
index 90f5a33f22..8d7162b351 100644
--- a/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ b/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb
@@ -4,5 +4,3 @@ include libxdmcp_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
diff --git a/openembedded/packages/xlibs/xext-native_cvs.bb b/openembedded/packages/xlibs/libxext-native_cvs.bb
index b6e0673bbe..9294b080b7 100644
--- a/openembedded/packages/xlibs/xext-native_cvs.bb
+++ b/openembedded/packages/xlibs/libxext-native_cvs.bb
@@ -1,6 +1,6 @@
 SECTION = "unknown"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
-include xext_${PV}.bb
+include libxext_${PV}.bb
 inherit native
-DEPENDS = "x11-native xextensions-native"
+DEPENDS = "libx11-native xextensions-native"
+PROVIDES = ""
diff --git a/openembedded/packages/xlibs/xext/autofoo.patch b/openembedded/packages/xlibs/libxext/autofoo.patch
index c006884526..c006884526 100644
--- a/openembedded/packages/xlibs/xext/autofoo.patch
+++ b/openembedded/packages/xlibs/libxext/autofoo.patch
diff --git a/openembedded/packages/xlibs/xext_cvs.bb b/openembedded/packages/xlibs/libxext_cvs.bb
index 4ea5061264..0ef675ca70 100644
--- a/openembedded/packages/xlibs/xext_cvs.bb
+++ b/openembedded/packages/xlibs/libxext_cvs.bb
@@ -4,7 +4,8 @@ LICENSE= "MIT"
 DESCRIPTION = "X Server Extension library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "xproto x11 xextensions"
+DEPENDS = "xproto libx11 xextensions"
+PROVIDES = "xext"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
diff --git a/openembedded/packages/xlibs/libxfixes_2.0.1.bb b/openembedded/packages/xlibs/libxfixes_2.0.1.bb
index 29e23e379d..710fa17454 100644
--- a/openembedded/packages/xlibs/libxfixes_2.0.1.bb
+++ b/openembedded/packages/xlibs/libxfixes_2.0.1.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "x11 fixesext"
+DEPENDS = "libx11 fixesext"
 DESCRIPTION = "X Fixes extension library."
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libxfixes_cvs.bb b/openembedded/packages/xlibs/libxfixes_cvs.bb
index f02f9518cf..4494dc9326 100644
--- a/openembedded/packages/xlibs/libxfixes_cvs.bb
+++ b/openembedded/packages/xlibs/libxfixes_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 fixesext"
+DEPENDS = "libx11 fixesext"
 DESCRIPTION = "X Fixes extension library."
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
diff --git a/openembedded/packages/xlibs/xfont/autofoo.patch b/openembedded/packages/xlibs/libxfont/autofoo.patch
index 4998625c24..4998625c24 100644
--- a/openembedded/packages/xlibs/xfont/autofoo.patch
+++ b/openembedded/packages/xlibs/libxfont/autofoo.patch
diff --git a/openembedded/packages/xlibs/xfont/scalable.patch b/openembedded/packages/xlibs/libxfont/scalable.patch
index 7f97b9a8f6..7f97b9a8f6 100644
--- a/openembedded/packages/xlibs/xfont/scalable.patch
+++ b/openembedded/packages/xlibs/libxfont/scalable.patch
diff --git a/openembedded/packages/xlibs/xfont_1.4.2.bb b/openembedded/packages/xlibs/libxfont_1.4.2.bb
index 7ef1d2b17f..0cc45397fe 100644
--- a/openembedded/packages/xlibs/xfont_1.4.2.bb
+++ b/openembedded/packages/xlibs/libxfont_1.4.2.bb
@@ -3,6 +3,7 @@ LICENSE = "BSD-X"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xtrans zlib"
+PROVIDES = "xfont"
 DESCRIPTION = "X font library (used by the X server)."
 PR = "r2"
diff --git a/openembedded/packages/xlibs/xfont_cvs.bb b/openembedded/packages/xlibs/libxfont_cvs.bb
index 49896ecd83..bd21e0fd12 100644
--- a/openembedded/packages/xlibs/xfont_cvs.bb
+++ b/openembedded/packages/xlibs/libxfont_cvs.bb
@@ -4,6 +4,7 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xtrans zlib"
+PROVIDES = "xfont"
 DESCRIPTION = "X font library (used by the X server)."
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
diff --git a/openembedded/packages/xlibs/libxft_2.1.6.bb b/openembedded/packages/xlibs/libxft_2.1.6.bb
index 12c8bdfb62..c3f1f74e40 100644
--- a/openembedded/packages/xlibs/libxft_2.1.6.bb
+++ b/openembedded/packages/xlibs/libxft_2.1.6.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
-DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
 DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 PROVIDES = "xft"
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libxft_cvs.bb b/openembedded/packages/xlibs/libxft_cvs.bb
index 01c53b47d5..6c1a5f5c32 100644
--- a/openembedded/packages/xlibs/libxft_cvs.bb
+++ b/openembedded/packages/xlibs/libxft_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
 DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 PROVIDES = "xft"
diff --git a/openembedded/packages/xlibs/libxi_6.0.1.bb b/openembedded/packages/xlibs/libxi_6.0.1.bb
index 05ad22989f..5c44d06df3 100644
--- a/openembedded/packages/xlibs/libxi_6.0.1.bb
+++ b/openembedded/packages/xlibs/libxi_6.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "X Input Extension library"
 LICENSE = "MIT-X"
 SECTION = "x11/libs"
-DEPENDS = "xproto x11 xextensions"
+DEPENDS = "xproto libx11 xextensions"
 PR = "r1"
 SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
diff --git a/openembedded/packages/xlibs/xmu_cvs.bb b/openembedded/packages/xlibs/libxmu_cvs.bb
index 9420280adc..500b373c32 100644
--- a/openembedded/packages/xlibs/xmu_cvs.bb
+++ b/openembedded/packages/xlibs/libxmu_cvs.bb
@@ -2,7 +2,8 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "xt xext"
+DEPENDS = "libxt libxext"
+PROVIDES = "xmu"
 PR = "r2"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
diff --git a/openembedded/packages/xlibs/xpm/autofoo.patch b/openembedded/packages/xlibs/libxpm/autofoo.patch
index 6b2174bf02..6b2174bf02 100644
--- a/openembedded/packages/xlibs/xpm/autofoo.patch
+++ b/openembedded/packages/xlibs/libxpm/autofoo.patch
diff --git a/openembedded/packages/xlibs/xpm_3.5.1.bb b/openembedded/packages/xlibs/libxpm_3.5.1.bb
index ea863f1eb6..513261efd3 100644
--- a/openembedded/packages/xlibs/xpm_3.5.1.bb
+++ b/openembedded/packages/xlibs/libxpm_3.5.1.bb
@@ -2,7 +2,8 @@ SECTION = "x11/libs"
 LICENSE = "X-BSD"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto x11"
+DEPENDS = "xproto libx11"
+PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
 PR = "r1"
diff --git a/openembedded/packages/xlibs/xpm_cvs.bb b/openembedded/packages/xlibs/libxpm_cvs.bb
index 78e44b3f9b..1b46855735 100644
--- a/openembedded/packages/xlibs/xpm_cvs.bb
+++ b/openembedded/packages/xlibs/libxpm_cvs.bb
@@ -3,7 +3,8 @@ LICENSE = "X-BSD"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto x11"
+DEPENDS = "xproto libx11"
+PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libxrandr_1.0.2.bb b/openembedded/packages/xlibs/libxrandr_1.0.2.bb
index ff32e0aa35..efd0505544 100644
--- a/openembedded/packages/xlibs/libxrandr_1.0.2.bb
+++ b/openembedded/packages/xlibs/libxrandr_1.0.2.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
-DEPENDS = "randrext x11 libxrender xext"
+DEPENDS = "randrext libx11 libxrender libxext"
 DESCRIPTION = "X Resize and Rotate extension library."
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libxrender_cvs.bb b/openembedded/packages/xlibs/libxrender_cvs.bb
index 76c4af5bbc..ea6b1f4607 100644
--- a/openembedded/packages/xlibs/libxrender_cvs.bb
+++ b/openembedded/packages/xlibs/libxrender_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 SECTION = "libs"
-DEPENDS = "renderext x11"
+DEPENDS = "renderext libx11"
 DESCRIPTION = "X Render extension library."
 LICENSE = "BSD"
diff --git a/openembedded/packages/xlibs/xt/autofoo.patch b/openembedded/packages/xlibs/libxt/autofoo.patch
index ff6dfdbbcc..ff6dfdbbcc 100644
--- a/openembedded/packages/xlibs/xt/autofoo.patch
+++ b/openembedded/packages/xlibs/libxt/autofoo.patch
diff --git a/openembedded/packages/xlibs/xt_0.1.5.bb b/openembedded/packages/xlibs/libxt_0.1.5.bb
index 52235e2d97..00cbe9a3ad 100644
--- a/openembedded/packages/xlibs/xt_0.1.5.bb
+++ b/openembedded/packages/xlibs/libxt_0.1.5.bb
@@ -1,7 +1,8 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 libsm"
+DEPENDS = "libx11 libsm"
+PROVIDES = "xt"
 DESCRIPTION = "X Toolkit Intrinsics"
 LICENSE = "X-MIT"
 PR = "r1"
diff --git a/openembedded/packages/xtst/xtst_cvs.bb b/openembedded/packages/xlibs/libxtst_cvs.bb
index 1662d3983a..c7c24d5d74 100644
--- a/openembedded/packages/xtst/xtst_cvs.bb
+++ b/openembedded/packages/xlibs/libxtst_cvs.bb
@@ -2,7 +2,8 @@ LICENSE = "GPL"
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "x11 recordext xext"
+DEPENDS = "libx11 recordext libxext"
+PROVIDES = "xtst"
 DESCRIPTION = "X Test Extension: client side library"
 PR = "r3"
diff --git a/openembedded/packages/xmodmap/xmodmap_cvs.bb b/openembedded/packages/xmodmap/xmodmap_cvs.bb
index 9582639559..773466e6bb 100644
--- a/openembedded/packages/xmodmap/xmodmap_cvs.bb
+++ b/openembedded/packages/xmodmap/xmodmap_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r1"
-DEPENDS = "x11"
+DEPENDS = "libx11"
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
           file://autofoo.patch;patch=1"
diff --git a/openembedded/packages/xrandr/xrandr_cvs.bb b/openembedded/packages/xrandr/xrandr_cvs.bb
index 1e6609384b..0ab7c745f4 100644
--- a/openembedded/packages/xrandr/xrandr_cvs.bb
+++ b/openembedded/packages/xrandr/xrandr_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
-DEPENDS = "libxrandr x11 xext"
+DEPENDS = "libxrandr libx11 libxext"
 DESCRIPTION = "X Resize and Rotate extension command."
 SECTION = "x11/base"
diff --git a/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb
index fac7718a1f..682490b3a1 100644
--- a/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb
@@ -1,5 +1,5 @@
 LICENSE = "MIT"
-DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
 PROVIDES = "virtual/xserver"
 PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
index 9567863aaf..2b007d4809 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
@@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 DEFAULT_PREFERENCE = "1"
 LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions-1.0.1 xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
 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"
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
index fcabbd4d28..c2e44f7837 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}"
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
 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"
diff --git a/openembedded/packages/xserver/xserver-kdrive_cvs.bb b/openembedded/packages/xserver/xserver-kdrive_cvs.bb
index dd93ed5418..f034fbfd73 100644
--- a/openembedded/packages/xserver/xserver-kdrive_cvs.bb
+++ b/openembedded/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 xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
 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"
diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
index c5b05cd2fc..37546fe1ee 100644
--- a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver"
 LICENSE = "Xorg"
 PR = "r2"
-DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
        file://imake-staging.patch;patch=1 \
diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
index 2a0519fd76..e60f62ef57 100644
--- a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver"
 LICENSE = "Xorg"
 PR = "r0"
-DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
        file://imake-staging.patch;patch=1 \
diff --git a/openembedded/packages/xserver/xserver-xorg_cvs.bb b/openembedded/packages/xserver/xserver-xorg_cvs.bb
index 9c64fb8377..e410581e17 100644
--- a/openembedded/packages/xserver/xserver-xorg_cvs.bb
+++ b/openembedded/packages/xserver/xserver-xorg_cvs.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/xserver"
 PR = "r3"
 PV = "6.8.1+cvs${SRCDATE}"
-DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
+DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
        file://imake-staging.patch;patch=1 \
diff --git a/openembedded/packages/xtscal/xtscal_0.6.3.bb b/openembedded/packages/xtscal/xtscal_0.6.3.bb
index a2a770f4fe..70666f1fbf 100644
--- a/openembedded/packages/xtscal/xtscal_0.6.3.bb
+++ b/openembedded/packages/xtscal/xtscal_0.6.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Touchscreen calibration utility"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
-DEPENDS = "x11 libxft libxrandr xcalibrate"
+DEPENDS = "libx11 libxft libxrandr xcalibrate"
 PR = "r1"
diff --git a/openembedded/site/arm-linux b/openembedded/site/arm-linux
index e3e9968725..dbed723cc0 100644
--- a/openembedded/site/arm-linux
+++ b/openembedded/site/arm-linux
@@ -362,3 +362,7 @@ with_broken_putenv=${with_broken_putenv=no}
 # xffm
 jm_cv_func_working_readdir=yes
+# dpkg
+dpkg_cv_va_copy=${ac_cv_va_copy=no}
+dpkg_cv___va_copy=${ac_cv___va_copy=yes}