merge of 0abc64672fd7bfbde3b0d9aec834bbe1623570b1

     and 71d2eba1824aa4f45a3d63f7406148b84b342637

147 files changed, 81 insertions, 58 deletions

diff --git a/packages/libxvmc/files/.mtn2git_empty b/packages/libxvmc/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxvmc/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxxf86dga/.mtn2git_empty b/packages/libxxf86dga/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxxf86dga/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxxf86vm/.mtn2git_empty b/packages/libxxf86vm/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxxf86vm/.mtn2git_empty
+++ /dev/null
diff --git a/packages/x11/.mtn2git_empty b/packages/x11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/x11/.mtn2git_empty
+++ /dev/null
diff --git a/packages/x11/files/.mtn2git_empty b/packages/x11/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/x11/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xau/.mtn2git_empty b/packages/xau/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xau/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xau/files/.mtn2git_empty b/packages/xau/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xau/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xaw/.mtn2git_empty b/packages/xaw/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xaw/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xaw/files/.mtn2git_empty b/packages/xaw/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xaw/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xcomposite/.mtn2git_empty b/packages/xcomposite/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xcomposite/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty b/packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xdamage/.mtn2git_empty b/packages/xdamage/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xdamage/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xdamage/xdamage-1.0.1/.mtn2git_empty b/packages/xdamage/xdamage-1.0.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xdamage/xdamage-1.0.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xdamage/xdamage/.mtn2git_empty b/packages/xdamage/xdamage/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xdamage/xdamage/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xdmcp/.mtn2git_empty b/packages/xdmcp/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xdmcp/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xdmcp/files/.mtn2git_empty b/packages/xdmcp/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xdmcp/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xext/.mtn2git_empty b/packages/xext/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xext/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xext/files/.mtn2git_empty b/packages/xext/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xext/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfont/.mtn2git_empty b/packages/xfont/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfont/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfont/files/.mtn2git_empty b/packages/xfont/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfont/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xinerama/.mtn2git_empty b/packages/xinerama/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xinerama/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ice/.mtn2git_empty b/packages/xlibs/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ice/.mtn2git_empty
+++ b/packages/xlibs/.mtn2git_empty
diff --git a/packages/x11/diet-x11_20050226.bb b/packages/xlibs/diet-x11_20050226.bb
index acb6fc330b..cab8c5d570 100644
--- a/packages/x11/diet-x11_20050226.bb
+++ b/packages/xlibs/diet-x11_20050226.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include x11_${PV}.bb
+include libx11_${PV}.bb
 
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
 
diff --git a/packages/x11/diet-x11_6.2.1.bb b/packages/xlibs/diet-x11_6.2.1.bb
index b63bfa041a..643e658412 100644
--- a/packages/x11/diet-x11_6.2.1.bb
+++ b/packages/xlibs/diet-x11_6.2.1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include x11_${PV}.bb
+include libx11_${PV}.bb
 
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/x11/diet-x11_cvs.bb b/packages/xlibs/diet-x11_cvs.bb
index 0adf717f17..eea73f0964 100644
--- a/packages/x11/diet-x11_cvs.bb
+++ b/packages/xlibs/diet-x11_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include x11_cvs.bb
+include libx11_cvs.bb
 
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
 
diff --git a/packages/ice/files/.mtn2git_empty b/packages/xlibs/libice/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ice/files/.mtn2git_empty
+++ b/packages/xlibs/libice/.mtn2git_empty
diff --git a/packages/ice/files/autofoo.patch b/packages/xlibs/libice/autofoo.patch
index 8ab0585fb8..8ab0585fb8 100644
--- a/packages/ice/files/autofoo.patch
+++ b/packages/xlibs/libice/autofoo.patch
diff --git a/packages/ice/ice_6.3.3.bb b/packages/xlibs/libice_6.3.3.bb
index 7722bc4ae5..1311145334 100644
--- a/packages/ice/ice_6.3.3.bb
+++ b/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/packages/ice/ice_cvs.bb b/packages/xlibs/libice_cvs.bb
index fa49ee76b9..90c98d594a 100644
--- a/packages/ice/ice_cvs.bb
+++ b/packages/xlibs/libice_cvs.bb
@@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE= "MIT"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
+PROVIDES = "ice"
 DESCRIPTION = "X11 ICE library"
 PR = "r1"
 
diff --git a/packages/libsm/.mtn2git_empty b/packages/xlibs/libsm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsm/.mtn2git_empty
+++ b/packages/xlibs/libsm/.mtn2git_empty
diff --git a/packages/libsm/files/autofoo.patch b/packages/xlibs/libsm/autofoo.patch
index 8cb204a66e..8cb204a66e 100644
--- a/packages/libsm/files/autofoo.patch
+++ b/packages/xlibs/libsm/autofoo.patch
diff --git a/packages/libsm/libsm_6.0.3.bb b/packages/xlibs/libsm_6.0.3.bb
index 2d78d3decb..08f9597045 100644
--- a/packages/libsm/libsm_6.0.3.bb
+++ b/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"
 
diff --git a/packages/libsm/libsm_cvs.bb b/packages/xlibs/libsm_cvs.bb
index 0c121f72d0..22b316cf57 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/xlibs/libsm_cvs.bb
@@ -2,7 +2,7 @@ PV = "6.0.3+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "x11 ice"
+DEPENDS = "libx11 libice"
 DESCRIPTION = "Session management library"
 PR = "r1"
 
diff --git a/packages/x11/x11-native_cvs.bb b/packages/xlibs/libx11-native_6.2.1.bb
index 30a31ebf9b..b1fd2aa0db 100644
--- a/packages/x11/x11-native_cvs.bb
+++ b/packages/xlibs/libx11-native_6.2.1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include x11_cvs.bb
+include libx11_${PV}.bb
 inherit native
 DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
 PROVIDES = ""
diff --git a/packages/x11/x11-native_6.2.1.bb b/packages/xlibs/libx11-native_cvs.bb
index cb44531b87..161c070899 100644
--- a/packages/x11/x11-native_6.2.1.bb
+++ b/packages/xlibs/libx11-native_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include x11_${PV}.bb
+include libx11_cvs.bb
 inherit native
 DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
 PROVIDES = ""
diff --git a/packages/libsm/files/.mtn2git_empty b/packages/xlibs/libx11/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsm/files/.mtn2git_empty
+++ b/packages/xlibs/libx11/.mtn2git_empty
diff --git a/packages/x11/files/autofoo.patch b/packages/xlibs/libx11/autofoo.patch
index 8bdba09768..8bdba09768 100644
--- a/packages/x11/files/autofoo.patch
+++ b/packages/xlibs/libx11/autofoo.patch
diff --git a/packages/x11/files/errordb-keysymdb-path-fix.patch b/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
index f43d38065e..f43d38065e 100644
--- a/packages/x11/files/errordb-keysymdb-path-fix.patch
+++ b/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
diff --git a/packages/x11/files/fix-utf8-wrong-define.patch b/packages/xlibs/libx11/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/packages/x11/files/fix-utf8-wrong-define.patch
+++ b/packages/xlibs/libx11/fix-utf8-wrong-define.patch
diff --git a/packages/x11/files/xim.patch b/packages/xlibs/libx11/xim.patch
index 0eab197a80..0eab197a80 100644
--- a/packages/x11/files/xim.patch
+++ b/packages/xlibs/libx11/xim.patch
diff --git a/packages/x11/x11_20050226.bb b/packages/xlibs/libx11_20050226.bb
index b8206c29df..0bc30a42cc 100644
--- a/packages/x11/x11_20050226.bb
+++ b/packages/xlibs/libx11_20050226.bb
@@ -1,6 +1,6 @@
 SRCDATE = "20050226"
 
-include x11_cvs.bb
+include libx11_cvs.bb
 
 DEFAULT_PREFERENCE = "0"
 
diff --git a/packages/x11/x11_6.2.1.bb b/packages/xlibs/libx11_6.2.1.bb
index b1de21c383..0cb75ac0b0 100644
--- a/packages/x11/x11_6.2.1.bb
+++ b/packages/xlibs/libx11_6.2.1.bb
@@ -2,11 +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 xdmcp"
+PROVIDES = "x11"
 DESCRIPTION = "Base X libs."
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
-PROVIDES = "x11"
+PROVIDES = "libx11"
 PR = "r4"
 
 SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
diff --git a/packages/x11/x11_cvs.bb b/packages/xlibs/libx11_cvs.bb
index 5cc568de58..a8d07811d5 100644
--- a/packages/x11/x11_cvs.bb
+++ b/packages/xlibs/libx11_cvs.bb
@@ -4,11 +4,12 @@ PR = "r6"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DEPENDS = "xproto xextensions libxau xtrans xdmcp"
+PROVIDES = "x11"
 DESCRIPTION = "Base X libs."
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
-PROVIDES = "x11"
+PROVIDES = "libx11"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
 	   file://errordb-keysymdb-path-fix.patch;patch=1"
diff --git a/packages/xau/xau-native_cvs.bb b/packages/xlibs/libxau-native_0.1.1.bb
index 8c8bbb4dd1..3897fa6afe 100644
--- a/packages/xau/xau-native_cvs.bb
+++ b/packages/xlibs/libxau-native_0.1.1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include xau_cvs.bb
+include libxau_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
diff --git a/packages/xau/xau-native_0.1.1.bb b/packages/xlibs/libxau-native_cvs.bb
index 251749dc45..eee93dd44c 100644
--- a/packages/xau/xau-native_0.1.1.bb
+++ b/packages/xlibs/libxau-native_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-include xau_${PV}.bb
+include libxau_cvs.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
diff --git a/packages/libxcursor/.mtn2git_empty b/packages/xlibs/libxau/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxcursor/.mtn2git_empty
+++ b/packages/xlibs/libxau/.mtn2git_empty
diff --git a/packages/xau/files/autofoo.patch b/packages/xlibs/libxau/autofoo.patch
index 1e42eb974d..1e42eb974d 100644
--- a/packages/xau/files/autofoo.patch
+++ b/packages/xlibs/libxau/autofoo.patch
diff --git a/packages/xau/xau_0.1.1.bb b/packages/xlibs/libxau_0.1.1.bb
index 3c8b4a030b..dc1a28171b 100644
--- a/packages/xau/xau_0.1.1.bb
+++ b/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/packages/xau/xau_cvs.bb b/packages/xlibs/libxau_cvs.bb
index a0e2bd312f..518744816d 100644
--- a/packages/xau/xau_cvs.bb
+++ b/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/packages/libxcursor/files/.mtn2git_empty b/packages/xlibs/libxaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxcursor/files/.mtn2git_empty
+++ b/packages/xlibs/libxaw/.mtn2git_empty
diff --git a/packages/xaw/files/auxdir.patch b/packages/xlibs/libxaw/auxdir.patch
index 4226ab6a4d..4226ab6a4d 100644
--- a/packages/xaw/files/auxdir.patch
+++ b/packages/xlibs/libxaw/auxdir.patch
diff --git a/packages/xaw/xaw_7.0.2.bb b/packages/xlibs/libxaw_7.0.2.bb
index d75cefbdbb..929b54a127 100644
--- a/packages/xaw/xaw_7.0.2.bb
+++ b/packages/xlibs/libxaw_7.0.2.bb
@@ -2,7 +2,8 @@ SECTION = "x11/libs"
 LICENSE = "MIT"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "xproto x11 xt xmu xpm"
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
 DESCRIPTION = "X Athena Widgets library"
 
 SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \
diff --git a/packages/xaw/xaw_cvs.bb b/packages/xlibs/libxaw_cvs.bb
index 71d4f915ee..7860f6e6b1 100644
--- a/packages/xaw/xaw_cvs.bb
+++ b/packages/xlibs/libxaw_cvs.bb
@@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "xproto x11 xt xmu xpm"
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
 DESCRIPTION = "X Athena Widgets library"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
diff --git a/packages/libxcursor/libxcursor-1.1.2/.mtn2git_empty b/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxcursor/libxcursor-1.1.2/.mtn2git_empty
+++ b/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty
diff --git a/packages/xcomposite/xcomposite-1.0.1/autofoo.patch b/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
index 072cf25214..072cf25214 100644
--- a/packages/xcomposite/xcomposite-1.0.1/autofoo.patch
+++ b/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
diff --git a/packages/xcomposite/xcomposite_1.0.1.bb b/packages/xlibs/libxcomposite_1.0.1.bb
index d31ec4dad7..e2ca3bbc7b 100644
--- a/packages/xcomposite/xcomposite_1.0.1.bb
+++ b/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"
 
diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xlibs/libxcomposite_cvs.bb
index c2ec718cd6..1d8b69c8c6 100644
--- a/packages/xcomposite/xcomposite_cvs.bb
+++ b/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/packages/libxfixes/.mtn2git_empty b/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfixes/.mtn2git_empty
+++ b/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty
diff --git a/packages/libxcursor/libxcursor-1.1.2/autofoo.patch b/packages/xlibs/libxcursor-1.1.2/autofoo.patch
index 99cd45a7ea..99cd45a7ea 100644
--- a/packages/libxcursor/libxcursor-1.1.2/autofoo.patch
+++ b/packages/xlibs/libxcursor-1.1.2/autofoo.patch
diff --git a/packages/libxfixes/files/.mtn2git_empty b/packages/xlibs/libxcursor/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfixes/files/.mtn2git_empty
+++ b/packages/xlibs/libxcursor/.mtn2git_empty
diff --git a/packages/libxcursor/files/autofoo.patch b/packages/xlibs/libxcursor/autofoo.patch
index 7aa573ce13..7aa573ce13 100644
--- a/packages/libxcursor/files/autofoo.patch
+++ b/packages/xlibs/libxcursor/autofoo.patch
diff --git a/packages/libxcursor/libxcursor_1.1.2.bb b/packages/xlibs/libxcursor_1.1.2.bb
index 25744c7dca..25744c7dca 100644
--- a/packages/libxcursor/libxcursor_1.1.2.bb
+++ b/packages/xlibs/libxcursor_1.1.2.bb
diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/xlibs/libxcursor_cvs.bb
index 5fe2334b85..5fe2334b85 100644
--- a/packages/libxcursor/libxcursor_cvs.bb
+++ b/packages/xlibs/libxcursor_cvs.bb
diff --git a/packages/libxft/.mtn2git_empty b/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxft/.mtn2git_empty
+++ b/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty
diff --git a/packages/xdamage/xdamage-1.0.1/autofoo.patch b/packages/xlibs/libxdamage-1.0.1/autofoo.patch
index 1e3ec45d4a..1e3ec45d4a 100644
--- a/packages/xdamage/xdamage-1.0.1/autofoo.patch
+++ b/packages/xlibs/libxdamage-1.0.1/autofoo.patch
diff --git a/packages/libxft/files/.mtn2git_empty b/packages/xlibs/libxdamage/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxft/files/.mtn2git_empty
+++ b/packages/xlibs/libxdamage/.mtn2git_empty
diff --git a/packages/xdamage/xdamage/m4.patch b/packages/xlibs/libxdamage/m4.patch
index 393f3d13d2..393f3d13d2 100644
--- a/packages/xdamage/xdamage/m4.patch
+++ b/packages/xlibs/libxdamage/m4.patch
diff --git a/packages/xdamage/xdamage_1.0.1.bb b/packages/xlibs/libxdamage_1.0.1.bb
index 5b6c301374..040e863447 100644
--- a/packages/xdamage/xdamage_1.0.1.bb
+++ b/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/packages/xdamage/xdamage_cvs.bb b/packages/xlibs/libxdamage_cvs.bb
index d7d9e33f8d..ba8a68033a 100644
--- a/packages/xdamage/xdamage_cvs.bb
+++ b/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/packages/xdmcp/libxdmcp-native_0.1.1.bb b/packages/xlibs/libxdmcp-native_0.1.1.bb
index bd6d990f53..bd6d990f53 100644
--- a/packages/xdmcp/libxdmcp-native_0.1.1.bb
+++ b/packages/xlibs/libxdmcp-native_0.1.1.bb
diff --git a/packages/xdmcp/libxdmcp-native_0.1.3.bb b/packages/xlibs/libxdmcp-native_0.1.3.bb
index bd6d990f53..bd6d990f53 100644
--- a/packages/xdmcp/libxdmcp-native_0.1.3.bb
+++ b/packages/xlibs/libxdmcp-native_0.1.3.bb
diff --git a/packages/libxi/.mtn2git_empty b/packages/xlibs/libxdmcp/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxi/.mtn2git_empty
+++ b/packages/xlibs/libxdmcp/.mtn2git_empty
diff --git a/packages/xdmcp/files/autofoo.patch b/packages/xlibs/libxdmcp/autofoo.patch
index ff1a76ad04..ff1a76ad04 100644
--- a/packages/xdmcp/files/autofoo.patch
+++ b/packages/xlibs/libxdmcp/autofoo.patch
diff --git a/packages/xdmcp/libxdmcp_0.1.1.bb b/packages/xlibs/libxdmcp_0.1.1.bb
index 19fba1529e..19fba1529e 100644
--- a/packages/xdmcp/libxdmcp_0.1.1.bb
+++ b/packages/xlibs/libxdmcp_0.1.1.bb
diff --git a/packages/xdmcp/libxdmcp_0.1.3.bb b/packages/xlibs/libxdmcp_0.1.3.bb
index aa2736cdb2..aa2736cdb2 100644
--- a/packages/xdmcp/libxdmcp_0.1.3.bb
+++ b/packages/xlibs/libxdmcp_0.1.3.bb
diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xlibs/libxdmcp_cvs.bb
index 20b957b522..20b957b522 100644
--- a/packages/xdmcp/libxdmcp_cvs.bb
+++ b/packages/xlibs/libxdmcp_cvs.bb
diff --git a/packages/xext/xext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb
index 6be231f154..dfc439a9f6 100644
--- a/packages/xext/xext-native_cvs.bb
+++ b/packages/xlibs/libxext-native_cvs.bb
@@ -1,4 +1,4 @@
 SECTION = "unknown"
-include xext_${PV}.bb
+include libxext_${PV}.bb
 inherit native
 DEPENDS = "x11-native xextensions-native"
diff --git a/packages/libxi/files/.mtn2git_empty b/packages/xlibs/libxext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxi/files/.mtn2git_empty
+++ b/packages/xlibs/libxext/.mtn2git_empty
diff --git a/packages/xext/files/autofoo.patch b/packages/xlibs/libxext/autofoo.patch
index c006884526..c006884526 100644
--- a/packages/xext/files/autofoo.patch
+++ b/packages/xlibs/libxext/autofoo.patch
diff --git a/packages/xext/xext_cvs.bb b/packages/xlibs/libxext_cvs.bb
index 4ea5061264..0ef675ca70 100644
--- a/packages/xext/xext_cvs.bb
+++ b/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/packages/libxkbfile/.mtn2git_empty b/packages/xlibs/libxfixes/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxkbfile/.mtn2git_empty
+++ b/packages/xlibs/libxfixes/.mtn2git_empty
diff --git a/packages/libxfixes/files/autofoo.patch b/packages/xlibs/libxfixes/autofoo.patch
index 26803cf7f3..26803cf7f3 100644
--- a/packages/libxfixes/files/autofoo.patch
+++ b/packages/xlibs/libxfixes/autofoo.patch
diff --git a/packages/libxfixes/libxfixes_2.0.1.bb b/packages/xlibs/libxfixes_2.0.1.bb
index 29e23e379d..710fa17454 100644
--- a/packages/libxfixes/libxfixes_2.0.1.bb
+++ b/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/packages/libxfixes/libxfixes_cvs.bb b/packages/xlibs/libxfixes_cvs.bb
index f02f9518cf..4494dc9326 100644
--- a/packages/libxfixes/libxfixes_cvs.bb
+++ b/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/packages/libxp/.mtn2git_empty b/packages/xlibs/libxfont/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxp/.mtn2git_empty
+++ b/packages/xlibs/libxfont/.mtn2git_empty
diff --git a/packages/xfont/files/autofoo.patch b/packages/xlibs/libxfont/autofoo.patch
index 4998625c24..4998625c24 100644
--- a/packages/xfont/files/autofoo.patch
+++ b/packages/xlibs/libxfont/autofoo.patch
diff --git a/packages/xfont/files/scalable.patch b/packages/xlibs/libxfont/scalable.patch
index 7f97b9a8f6..7f97b9a8f6 100644
--- a/packages/xfont/files/scalable.patch
+++ b/packages/xlibs/libxfont/scalable.patch
diff --git a/packages/xfont/xfont_1.4.2.bb b/packages/xlibs/libxfont_1.4.2.bb
index 7ef1d2b17f..0cc45397fe 100644
--- a/packages/xfont/xfont_1.4.2.bb
+++ b/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/packages/xfont/xfont_cvs.bb b/packages/xlibs/libxfont_cvs.bb
index 49896ecd83..bd21e0fd12 100644
--- a/packages/xfont/xfont_cvs.bb
+++ b/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/packages/libxrandr/.mtn2git_empty b/packages/xlibs/libxft/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxrandr/.mtn2git_empty
+++ b/packages/xlibs/libxft/.mtn2git_empty
diff --git a/packages/libxft/files/autofoo.patch b/packages/xlibs/libxft/autofoo.patch
index 54120aa612..54120aa612 100644
--- a/packages/libxft/files/autofoo.patch
+++ b/packages/xlibs/libxft/autofoo.patch
diff --git a/packages/libxft/libxft_2.1.6.bb b/packages/xlibs/libxft_2.1.6.bb
index 12c8bdfb62..c3f1f74e40 100644
--- a/packages/libxft/libxft_2.1.6.bb
+++ b/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/packages/libxft/libxft_cvs.bb b/packages/xlibs/libxft_cvs.bb
index 01c53b47d5..6c1a5f5c32 100644
--- a/packages/libxft/libxft_cvs.bb
+++ b/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/packages/libxrandr/files/.mtn2git_empty b/packages/xlibs/libxi/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxrandr/files/.mtn2git_empty
+++ b/packages/xlibs/libxi/.mtn2git_empty
diff --git a/packages/libxi/files/autofoo.patch b/packages/xlibs/libxi/autofoo.patch
index f1bce9ed7a..f1bce9ed7a 100644
--- a/packages/libxi/files/autofoo.patch
+++ b/packages/xlibs/libxi/autofoo.patch
diff --git a/packages/libxi/libxi_6.0.1.bb b/packages/xlibs/libxi_6.0.1.bb
index 05ad22989f..5c44d06df3 100644
--- a/packages/libxi/libxi_6.0.1.bb
+++ b/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/packages/libxi/libxi_cvs.bb b/packages/xlibs/libxi_cvs.bb
index 5b221d9b36..767c641a95 100644
--- a/packages/libxi/libxi_cvs.bb
+++ b/packages/xlibs/libxi_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "x11/libs"
-DEPENDS = "xproto x11 xextensions"
+DEPENDS = "xproto libx11 xextensions"
 DESCRIPTION = "X Input extension library."
 PR = "r1"
 
diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb
index 48a6416b36..dc5d82b9b0 100644
--- a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
+++ b/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext xproto x11 xext"
+DEPENDS = "panoramixext xproto libx11 libxext"
+PROVIDES = "xinerama"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
 S = "${WORKDIR}/Xinerama"
diff --git a/packages/xinerama/xinerama_1.0.2.bb b/packages/xlibs/libxinerama_1.0.2.bb
index d67d750f46..a267e6c2d9 100644
--- a/packages/xinerama/xinerama_1.0.2.bb
+++ b/packages/xlibs/libxinerama_1.0.2.bb
@@ -3,7 +3,8 @@ DESCRIPTION = "Xinerama library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext xproto x11 xext"
+DEPENDS = "panoramixext xproto libx11 libxext"
+PROVIDES = "xinerama"
 PR = "r1"
 
 SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xlibs/libxinerama_cvs.bb
index a22e151917..3e959df19e 100644
--- a/packages/xinerama/xinerama_cvs.bb
+++ b/packages/xlibs/libxinerama_cvs.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Xinerama library"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "panoramixext xproto x11 xext"
+DEPENDS = "panoramixext xproto libx11 libxext"
+PROVIDES = "xinerama"
 PV = "0.0+cvs${SRCDATE}"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/xlibs/libxkbfile_cvs.bb
index 381e76383e..1b433ef65f 100644
--- a/packages/libxkbfile/libxkbfile_cvs.bb
+++ b/packages/xlibs/libxkbfile_cvs.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "x11"
+DEPENDS = "libx11"
 DESCRIPTION = "X11 keyboard library"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
diff --git a/packages/xmu/xmu_cvs.bb b/packages/xlibs/libxmu_cvs.bb
index 9420280adc..500b373c32 100644
--- a/packages/xmu/xmu_cvs.bb
+++ b/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/packages/libxp/libxp_cvs.bb b/packages/xlibs/libxp_cvs.bb
index a09e9cb79c..eaf6546d0e 100644
--- a/packages/libxp/libxp_cvs.bb
+++ b/packages/xlibs/libxp_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 PV = "0.0+cvs${SRCDATE}"
 
 SECTION = "libs"
-DEPENDS = "x11 xext"
+DEPENDS = "libx11 libxext"
 DESCRIPTION = "X print extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
diff --git a/packages/libxrandr/libxrandr-1.0.2/.mtn2git_empty b/packages/xlibs/libxpm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxrandr/libxrandr-1.0.2/.mtn2git_empty
+++ b/packages/xlibs/libxpm/.mtn2git_empty
diff --git a/packages/xpm/files/autofoo.patch b/packages/xlibs/libxpm/autofoo.patch
index 6b2174bf02..6b2174bf02 100644
--- a/packages/xpm/files/autofoo.patch
+++ b/packages/xlibs/libxpm/autofoo.patch
diff --git a/packages/xpm/xpm_3.5.1.bb b/packages/xlibs/libxpm_3.5.1.bb
index ea863f1eb6..513261efd3 100644
--- a/packages/xpm/xpm_3.5.1.bb
+++ b/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/packages/xpm/xpm_cvs.bb b/packages/xlibs/libxpm_cvs.bb
index 78e44b3f9b..1b46855735 100644
--- a/packages/xpm/xpm_cvs.bb
+++ b/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/packages/libxrender/.mtn2git_empty b/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxrender/.mtn2git_empty
+++ b/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty
diff --git a/packages/libxrandr/libxrandr-1.0.2/autofoo.patch b/packages/xlibs/libxrandr-1.0.2/autofoo.patch
index 21f6e7fd78..21f6e7fd78 100644
--- a/packages/libxrandr/libxrandr-1.0.2/autofoo.patch
+++ b/packages/xlibs/libxrandr-1.0.2/autofoo.patch
diff --git a/packages/libxrender/files/.mtn2git_empty b/packages/xlibs/libxrandr/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxrender/files/.mtn2git_empty
+++ b/packages/xlibs/libxrandr/.mtn2git_empty
diff --git a/packages/libxrandr/files/autofoo.patch b/packages/xlibs/libxrandr/autofoo.patch
index 7b1db760f2..7b1db760f2 100644
--- a/packages/libxrandr/files/autofoo.patch
+++ b/packages/xlibs/libxrandr/autofoo.patch
diff --git a/packages/libxrandr/libxrandr_1.0.2.bb b/packages/xlibs/libxrandr_1.0.2.bb
index ff32e0aa35..efd0505544 100644
--- a/packages/libxrandr/libxrandr_1.0.2.bb
+++ b/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/packages/libxrandr/libxrandr_cvs.bb b/packages/xlibs/libxrandr_cvs.bb
index 5ff10a3118..3b6fd02de8 100644
--- a/packages/libxrandr/libxrandr_cvs.bb
+++ b/packages/xlibs/libxrandr_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "randrext x11 libxrender xext"
+DEPENDS = "randrext libx11 libxrender libxext"
 DESCRIPTION = "X Resize and Rotate extension library."
 PR = "r1"
 
diff --git a/packages/libxss/.mtn2git_empty b/packages/xlibs/libxrender/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxss/.mtn2git_empty
+++ b/packages/xlibs/libxrender/.mtn2git_empty
diff --git a/packages/libxrender/files/autofoo.patch b/packages/xlibs/libxrender/autofoo.patch
index eb21c766f8..eb21c766f8 100644
--- a/packages/libxrender/files/autofoo.patch
+++ b/packages/xlibs/libxrender/autofoo.patch
diff --git a/packages/libxrender/libxrender_0.8.4.bb b/packages/xlibs/libxrender_0.8.4.bb
index 7c357b4c22..b36c5701ba 100644
--- a/packages/libxrender/libxrender_0.8.4.bb
+++ b/packages/xlibs/libxrender_0.8.4.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
-DEPENDS = "renderext x11"
+DEPENDS = "renderext libx11"
 DESCRIPTION = "X Render extension library."
 LICENSE = "BSD"
 PR = "r1"
diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/xlibs/libxrender_cvs.bb
index 76c4af5bbc..ea6b1f4607 100644
--- a/packages/libxrender/libxrender_cvs.bb
+++ b/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/packages/xres/xres_1.0.1.bb b/packages/xlibs/libxres_1.0.1.bb
index 06226eb100..c01731d37a 100644
--- a/packages/xres/xres_1.0.1.bb
+++ b/packages/xlibs/libxres_1.0.1.bb
@@ -1,6 +1,7 @@
 SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "x11 xextensions xext resourceext"
+DEPENDS = "libx11 xextensions libxext resourceext"
+PROVIDES = "xres"
 DESCRIPTION = "X Resource usage library."
 LICENSE = "X-MIT"
 SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2"
diff --git a/packages/xres/xres_cvs.bb b/packages/xlibs/libxres_cvs.bb
index 7fe8f4aa60..e3e5c6704c 100644
--- a/packages/xres/xres_cvs.bb
+++ b/packages/xlibs/libxres_cvs.bb
@@ -1,7 +1,8 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "x11 xextensions xext resourceext"
+DEPENDS = "libx11 xextensions libxext resourceext"
+PROVIDES = "xres"
 DESCRIPTION = "X Resource usage library."
 LICENSE = "X-MIT"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
diff --git a/packages/libxss/libxss_cvs.bb b/packages/xlibs/libxss_cvs.bb
index ff766757fb..af064f5b4d 100644
--- a/packages/libxss/libxss_cvs.bb
+++ b/packages/xlibs/libxss_cvs.bb
@@ -4,7 +4,7 @@ PV = "0.0+cvs${SRCDATE}"
 PR = "r2"
 
 SECTION = "libs"
-DEPENDS = "x11 xext"
+DEPENDS = "libx11 libxext"
 DESCRIPTION = "X screen saver extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
diff --git a/packages/libxv/.mtn2git_empty b/packages/xlibs/libxt/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxv/.mtn2git_empty
+++ b/packages/xlibs/libxt/.mtn2git_empty
diff --git a/packages/xt/files/autofoo.patch b/packages/xlibs/libxt/autofoo.patch
index ff6dfdbbcc..ff6dfdbbcc 100644
--- a/packages/xt/files/autofoo.patch
+++ b/packages/xlibs/libxt/autofoo.patch
diff --git a/packages/xt/xt_0.1.5.bb b/packages/xlibs/libxt_0.1.5.bb
index 52235e2d97..00cbe9a3ad 100644
--- a/packages/xt/xt_0.1.5.bb
+++ b/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/packages/xt/xt_cvs.bb b/packages/xlibs/libxt_cvs.bb
index 3434a63565..fdabe1d90f 100644
--- a/packages/xt/xt_cvs.bb
+++ b/packages/xlibs/libxt_cvs.bb
@@ -1,8 +1,8 @@
 PV = "0.0+cvs${SRCDATE}"
 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/packages/xtst/xtst_cvs.bb b/packages/xlibs/libxtst_cvs.bb
index 1662d3983a..c7c24d5d74 100644
--- a/packages/xtst/xtst_cvs.bb
+++ b/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/packages/libxv/libxv_2.2.2+cvs20040918.bb b/packages/xlibs/libxv_2.2.2+cvs20040918.bb
index e5e4240672..e70ce9cee9 100644
--- a/packages/libxv/libxv_2.2.2+cvs20040918.bb
+++ b/packages/xlibs/libxv_2.2.2+cvs20040918.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/libs"
-DEPENDS = "x11 xext"
+DEPENDS = "libx11 libxext"
 DESCRIPTION = "X Video extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
diff --git a/packages/libxv/libxv_2.2.2.bb b/packages/xlibs/libxv_2.2.2.bb
index d52f3ef76c..49e9670120 100644
--- a/packages/libxv/libxv_2.2.2.bb
+++ b/packages/xlibs/libxv_2.2.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/libs"
-DEPENDS = "x11 xext"
+DEPENDS = "libx11 libxext"
 DESCRIPTION = "X Video extension library."
 
 SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
diff --git a/packages/libxvmc/.mtn2git_empty b/packages/xlibs/libxvmc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxvmc/.mtn2git_empty
+++ b/packages/xlibs/libxvmc/.mtn2git_empty
diff --git a/packages/libxvmc/files/drm.patch b/packages/xlibs/libxvmc/drm.patch
index d48cdb3d0b..d48cdb3d0b 100644
--- a/packages/libxvmc/files/drm.patch
+++ b/packages/xlibs/libxvmc/drm.patch
diff --git a/packages/libxvmc/files/true.patch b/packages/xlibs/libxvmc/true.patch
index 7059295007..7059295007 100644
--- a/packages/libxvmc/files/true.patch
+++ b/packages/xlibs/libxvmc/true.patch
diff --git a/packages/libxvmc/files/via.patch b/packages/xlibs/libxvmc/via.patch
index 21cdfbdd6b..21cdfbdd6b 100644
--- a/packages/libxvmc/files/via.patch
+++ b/packages/xlibs/libxvmc/via.patch
diff --git a/packages/libxvmc/libxvmc_20040919.bb b/packages/xlibs/libxvmc_20040919.bb
index f88f667d3e..b70c9f52e4 100644
--- a/packages/libxvmc/libxvmc_20040919.bb
+++ b/packages/xlibs/libxvmc_20040919.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "X Video Motion Compensation extension library."
 SECTION = "x11/libs"
-DEPENDS = "x11 xext libxv drm xserver-xorg"
+DEPENDS = "libx11 libxext libxv drm xserver-xorg"
 PR = "r2"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
diff --git a/packages/libxvmc/libxvmc_20041025.bb b/packages/xlibs/libxvmc_20041025.bb
index 311f65de61..829a74d92b 100644
--- a/packages/libxvmc/libxvmc_20041025.bb
+++ b/packages/xlibs/libxvmc_20041025.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "X Video Motion Compensation extension library."
 SECTION = "x11/libs"
-DEPENDS = "x11 xext libxv drm xserver-xorg"
+DEPENDS = "libx11 libxext libxv drm xserver-xorg"
 PR = "r2"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
diff --git a/packages/libxvmc/libxvmc_20050612.bb b/packages/xlibs/libxvmc_20050612.bb
index 49e8b57585..18cd369acc 100644
--- a/packages/libxvmc/libxvmc_20050612.bb
+++ b/packages/xlibs/libxvmc_20050612.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "X Video Motion Compensation extension library."
 SECTION = "x11/libs"
-DEPENDS = "x11 xext libxv drm xserver-xorg"
+DEPENDS = "libx11 libxext libxv drm xserver-xorg"
 PR = "r0"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
diff --git a/packages/libxxf86dga/libxxf86dga_cvs.bb b/packages/xlibs/libxxf86dga_cvs.bb
index 6111b343a2..96acce5d0e 100644
--- a/packages/libxxf86dga/libxxf86dga_cvs.bb
+++ b/packages/xlibs/libxxf86dga_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "XFree86"
 
 SECTION = "x11/libs"
-DEPENDS = "x11 xext xxf86dgaext"
+DEPENDS = "libx11 libxext xxf86dgaext"
 DESCRIPTION = "Xxf86dga extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/xlibs/libxxf86vm_cvs.bb
index d0c342e3f3..5eb48f930d 100644
--- a/packages/libxxf86vm/libxxf86vm_cvs.bb
+++ b/packages/xlibs/libxxf86vm_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 
 SECTION = "x11/libs"
-DEPENDS = "x11 xext xxf86vmext"
+DEPENDS = "libx11 libxext xxf86vmext"
 DESCRIPTION = "Xxf86vm extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
diff --git a/packages/xtrans/xtrans-native_0.1.bb b/packages/xlibs/xtrans-native_0.1.bb
index 80de95c869..80de95c869 100644
--- a/packages/xtrans/xtrans-native_0.1.bb
+++ b/packages/xlibs/xtrans-native_0.1.bb
diff --git a/packages/xtrans/xtrans_0.1.bb b/packages/xlibs/xtrans_0.1.bb
index 8fee0d5089..8fee0d5089 100644
--- a/packages/xtrans/xtrans_0.1.bb
+++ b/packages/xlibs/xtrans_0.1.bb
diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xlibs/xtrans_cvs.bb
index 9714f4017b..9714f4017b 100644
--- a/packages/xtrans/xtrans_cvs.bb
+++ b/packages/xlibs/xtrans_cvs.bb
diff --git a/packages/xmu/.mtn2git_empty b/packages/xmu/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xmu/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xpm/.mtn2git_empty b/packages/xpm/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xpm/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xpm/files/.mtn2git_empty b/packages/xpm/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xpm/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xres/.mtn2git_empty b/packages/xres/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xres/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xt/.mtn2git_empty b/packages/xt/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xt/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xt/files/.mtn2git_empty b/packages/xt/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xt/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xtrans/.mtn2git_empty b/packages/xtrans/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xtrans/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xtst/.mtn2git_empty b/packages/xtst/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xtst/.mtn2git_empty
+++ /dev/null