x11: switch to virtual/x11 so that diet or full x11 can be selected

- emacs and synergy need full x11, hence libx11 instead of virtual/x11
- any other packages which depend on a full x11 will need the same change

96 files changed, 96 insertions, 96 deletions

diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
index e6780a89f2..cb0d42a2a6 100644
--- a/packages/xorg-app/appres_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 DESCRIPTION = "The appres program prints the resources seen by an application."
 
-DEPENDS += " libx11 libxt"
+DEPENDS += " virtual/x11 libxt"
 
diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
index e8083fde2a..e25b3ba16a 100644
--- a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxscrnsaver libxt libxaw libxt"
+DEPENDS += " virtual/x11 libxscrnsaver libxt libxaw libxt"
 
diff --git a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
index a738705e7e..3d953e8a19 100644
--- a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
@@ -2,4 +2,4 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu xbitmaps libxt"
+DEPENDS += " virtual/x11 libxmu xbitmaps libxt"
diff --git a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
index 1f4c3ea1b1..3e5736e063 100644
--- a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu xbitmaps libxt"
+DEPENDS += " virtual/x11 libxmu xbitmaps libxt"
 
diff --git a/packages/xorg-app/editres_X11R7.0-1.0.1.bb b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
index aeb981cd43..908dc878cb 100644
--- a/packages/xorg-app/editres_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxt libxmu libxaw"
+DEPENDS += " virtual/x11 libxt libxmu libxaw"
 
diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
index b86b4ba4d8..b274cd549f 100644
--- a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libfs"
+DEPENDS += " virtual/x11 libfs"
 
diff --git a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
index b86b4ba4d8..b274cd549f 100644
--- a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libfs"
+DEPENDS += " virtual/x11 libfs"
 
diff --git a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
index b86b4ba4d8..b274cd549f 100644
--- a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libfs"
+DEPENDS += " virtual/x11 libfs"
 
diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/ico_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
index ce1485e63b..f18de41289 100644
--- a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
@@ -3,4 +3,4 @@ include xorg-app-common.inc
 DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
 extension to X (LBX) must make their connections to an lbxproxy."
 
-DEPENDS += " xtrans libxext liblbxutil libx11 libice xproxymngproto bigreqsproto zlib"
+DEPENDS += " xtrans libxext liblbxutil virtual/x11 libice xproxymngproto bigreqsproto zlib"
diff --git a/packages/xorg-app/listres_X11R7.0-1.0.1.bb b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
index cb0808ad2b..aff984e46b 100644
--- a/packages/xorg-app/listres_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxaw libx11 libxt libxmu"
+DEPENDS += " libxaw virtual/x11 libxt libxmu"
 
diff --git a/packages/xorg-app/luit_X11R7.0-1.0.1.bb b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
index de995f785b..c83cd38c5d 100644
--- a/packages/xorg-app/luit_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " zlib zlib libx11 libfontenc"
+DEPENDS += " zlib zlib virtual/x11 libfontenc"
 
diff --git a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
index a84aa3db3b..144e600beb 100644
--- a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxfont libfs libfontenc"
+DEPENDS += " virtual/x11 libxfont libfs libfontenc"
 
diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
index 98b49f99ac..29e304922d 100644
--- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 S="${WORKDIR}/mkfontscale-${PV}"
 
-DEPENDS = "libx11-native libfontenc-native"
+DEPENDS = "virtual/x11-native libfontenc-native"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2"
 
diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
index 0d90a387e2..dc2b681490 100644
--- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " zlib libfontenc freetype libx11"
+DEPENDS += " zlib libfontenc freetype virtual/x11"
 
diff --git a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
index c73ea3426b..4c564a3643 100644
--- a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu libxext libxt"
+DEPENDS += " virtual/x11 libxmu libxext libxt"
 
diff --git a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
index dc1e5ccbcf..7272764f52 100644
--- a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libice libxt libx11 xproxymngproto"
+DEPENDS += " libice libxt virtual/x11 xproxymngproto"
 
diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
index a6eb7ea7d4..0895ec79c8 100644
--- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxt"
+DEPENDS += " virtual/x11 libxt"
 
diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
index 3e99a06516..e1f332e8c1 100644
--- a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
@@ -2,6 +2,6 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
 
diff --git a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
index 962cdf481c..29ed7358d5 100644
--- a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxkbfile libx11"
+DEPENDS += " libxkbfile virtual/x11"
 
diff --git a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
index 962cdf481c..29ed7358d5 100644
--- a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxkbfile libx11"
+DEPENDS += " libxkbfile virtual/x11"
 
diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
index ab47831d31..c975c2c42d 100644
--- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-app-common.inc
 
 DESCRIPTION = "tiny window manager"
 
-DEPENDS += " libx11 libxext libxt libxmu"
+DEPENDS += " virtual/x11 libxext libxt libxmu"
 
 ALTERNATIVE_PATH = "${bindir}/twm"
 ALTERNATIVE_NAME = "x-window-manager"
diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
index 52746c9316..8e07c499b9 100644
--- a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu"
+DEPENDS += " virtual/x11 libxmu"
 
diff --git a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
index 83b1830524..4b4f4fe068 100644
--- a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
+++ b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
@@ -2,4 +2,4 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu libxrender libxft libxext"
+DEPENDS += " virtual/x11 libxmu libxrender libxft libxext"
diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
index 1608c22e0e..d9e62caa1f 100644
--- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxau libxext libxmu"
+DEPENDS += " virtual/x11 libxau libxext libxmu"
 
diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
index 54700574b7..c1489e10a9 100644
--- a/packages/xorg-app/xauth_cvs.bb
+++ b/packages/xorg-app/xauth_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "libx11 libxau libxmu libxext"
+DEPENDS = "virtual/x11 libxau libxmu libxext"
 DESCRIPTION = "X authority file utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
index aa68cc73e0..e8ee6e20a4 100644
--- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxaw libxrender libxft libxkbfile libxt"
+DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt"
 
diff --git a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
index aa68cc73e0..e8ee6e20a4 100644
--- a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxaw libxrender libxft libxkbfile libxt"
+DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt"
 
diff --git a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
index 2f5c449b0b..f75a98b9d3 100644
--- a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxcursor libpng"
+DEPENDS += " virtual/x11 libxcursor libpng"
 
diff --git a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
index 2f5c449b0b..f75a98b9d3 100644
--- a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxcursor libpng"
+DEPENDS += " virtual/x11 libxcursor libpng"
 
diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
index 0ccc5710a9..e99c1aa768 100644
--- a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-app-common.inc
 
 DESCRIPTION = "X display manager"
 
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libx11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt"
 
 EXTRA_OECONF += " --with-random-device=/dev/urandom"
 
diff --git a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
index 0450f2f8f3..438af7fbf6 100644
--- a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
+++ b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
@@ -2,6 +2,6 @@ include xorg-app-common.inc
 
 DESCRIPTION = "X display manager"
 
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libx11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt"
 
 EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
index a8f4c66934..c577aeb38a 100644
--- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-app-common.inc
 DESCRIPTION = "X display information utility"
 LICENSE = "MIT"
 
-DEPENDS += " libxtst libxext libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+DEPENDS += " libxtst libxext virtual/x11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
 
 SRC_URI += "file://disable-xkb.patch;patch=1"
 
diff --git a/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
index eb63ae7f4d..06d548c9ba 100644
--- a/packages/xorg-app/xdpyinfo_cvs.bb
+++ b/packages/xorg-app/xdpyinfo_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxtst"
+DEPENDS = "virtual/x11 libxext libxtst"
 DESCRIPTION = "X display information utility"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
index ced75ddf5a..9ab9e1a0e7 100644
--- a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 glproto mesa"
+DEPENDS += " virtual/x11 glproto mesa"
 
diff --git a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
index ced75ddf5a..9ab9e1a0e7 100644
--- a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 glproto mesa"
+DEPENDS += " virtual/x11 glproto mesa"
 
diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
index 3158de66a5..61b8ca4284 100644
--- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X Event Viewer"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 LICENSE = "MIT"
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
index 3ea9d05c63..e1f9a33a67 100644
--- a/packages/xorg-app/xev_cvs.bb
+++ b/packages/xorg-app/xev_cvs.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
 LICENSE = "MIT"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "x11/base"
-DEPENDS = "libx11 libxau"
+DEPENDS = "virtual/x11 libxau"
 PR = "r1"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
index bc0b9fb114..6d2c81ffd6 100644
--- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
@@ -2,4 +2,4 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxau libxt libxext libxmu"
+DEPENDS += " virtual/x11 libxau libxt libxext libxmu"
diff --git a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
index ef6de0aaaa..4dfb42d0b3 100644
--- a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxxf86dga libxt libxaw libxmu"
+DEPENDS += " virtual/x11 libxxf86dga libxt libxaw libxmu"
 
diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
index 02f8bf36b8..41fe411756 100644
--- a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libice libxt xproxymngproto"
+DEPENDS += " virtual/x11 libice libxt xproxymngproto"
 
diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
index b86b4ba4d8..b274cd549f 100644
--- a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libfs"
+DEPENDS += " virtual/x11 libfs"
 
diff --git a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
index 5300f85f86..258c980548 100644
--- a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libice xproxymngproto"
+DEPENDS += " virtual/x11 libice xproxymngproto"
 
diff --git a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
index d8ff2d20a5..8f3678475a 100644
--- a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxxf86vm"
+DEPENDS += " virtual/x11 libxxf86vm"
 
diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
index 4d36e62bee..1bc64ecf77 100644
--- a/packages/xorg-app/xhost_20040413.bb
+++ b/packages/xorg-app/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 = "libx11 libxext libxmu"
+DEPENDS = "virtual/x11 libxext libxmu"
 DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
index a53f8defed..ff7cacd178 100644
--- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "Server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
-DEPENDS += " libx11 libxmu libxau"
+DEPENDS += " virtual/x11 libxmu libxau"
 
diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
index a53f8defed..ff7cacd178 100644
--- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "Server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
-DEPENDS += " libx11 libxmu libxau"
+DEPENDS += " virtual/x11 libxmu libxau"
 
diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
index 3e99a06516..e1f332e8c1 100644
--- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
@@ -2,6 +2,6 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
 
diff --git a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
index f3259146f5..59f7755640 100644
--- a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
@@ -2,6 +2,6 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 FILES_${PN} += "  /usr/lib/X11/xinit"
 
diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
index debcdb4481..aa6b46e13c 100644
--- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
 
-DEPENDS += " libx11 libxkbfile"
+DEPENDS += " virtual/x11 libxkbfile"
 
diff --git a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
index debcdb4481..aa6b46e13c 100644
--- a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
 
-DEPENDS += " libx11 libxkbfile"
+DEPENDS += " virtual/x11 libxkbfile"
 
diff --git a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
index 962cdf481c..29ed7358d5 100644
--- a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxkbfile libx11"
+DEPENDS += " libxkbfile virtual/x11"
 
diff --git a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
index 962cdf481c..29ed7358d5 100644
--- a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxkbfile libx11"
+DEPENDS += " libxkbfile virtual/x11"
 
diff --git a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
index 962cdf481c..29ed7358d5 100644
--- a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxkbfile libx11"
+DEPENDS += " libxkbfile virtual/x11"
 
diff --git a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
index 125af907fc..512ff6c6de 100644
--- a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxaw libxkbfile libx11"
+DEPENDS += " libxaw libxkbfile virtual/x11"
 
diff --git a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
index 52746c9316..8e07c499b9 100644
--- a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu"
+DEPENDS += " virtual/x11 libxmu"
 
diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
index 52746c9316..8e07c499b9 100644
--- a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu"
+DEPENDS += " virtual/x11 libxmu"
 
diff --git a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
index 52746c9316..8e07c499b9 100644
--- a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxmu"
+DEPENDS += " virtual/x11 libxmu"
 
diff --git a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
index 3f1300b670..e0149a478f 100644
--- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
index b3e13bea6a..40e27576a6 100644
--- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
index 773466e6bb..c1fb2425d1 100644
--- a/packages/xorg-app/xmodmap_cvs.bb
+++ b/packages/xorg-app/xmodmap_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r1"
 
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
            file://autofoo.patch;patch=1"
diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
index 50558f2b05..609c5643bf 100644
--- a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxprintapputil libxaw libxprintutil libxt libxp"
+DEPENDS += " virtual/x11 libxprintapputil libxaw libxprintutil libxt libxp"
 
diff --git a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
index edde5ae353..f1c547af4e 100644
--- a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxp libxprintutil libx11"
+DEPENDS += " libxp libxprintutil virtual/x11"
 
diff --git a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
index 14c99d3343..7bba2c74df 100644
--- a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libx11"
+DEPENDS += " libxmu virtual/x11"
 
diff --git a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
index 97426ec2c7..cccb035df6 100644
--- a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxp libx11"
+DEPENDS += " libxp virtual/x11"
 
diff --git a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
index 14c99d3343..7bba2c74df 100644
--- a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libx11"
+DEPENDS += " libxmu virtual/x11"
 
diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
index f6dd54b7cd..93ddb2dbf6 100644
--- a/packages/xorg-app/xprop_cvs.bb
+++ b/packages/xorg-app/xprop_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "libx11 libxmu libxext"
+DEPENDS = "virtual/x11 libxmu libxext"
 DESCRIPTION = "property displayer for X"
 MAINTER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
index ac20c5f4cb..b03804bcb6 100644
--- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
@@ -3,5 +3,5 @@ include xorg-app-common.inc
 DESCRIPTION = "X Resize and Rotate extension command."
 LICENSE= "BSD-X"
 
-DEPENDS += " libxrandr libxrender libx11"
+DEPENDS += " libxrandr libxrender virtual/x11"
 
diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
index ac20c5f4cb..b03804bcb6 100644
--- a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
@@ -3,5 +3,5 @@ include xorg-app-common.inc
 DESCRIPTION = "X Resize and Rotate extension command."
 LICENSE= "BSD-X"
 
-DEPENDS += " libxrandr libxrender libx11"
+DEPENDS += " libxrandr libxrender virtual/x11"
 
diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
index 0ab7c745f4..f45e04115b 100644
--- a/packages/xorg-app/xrandr_cvs.bb
+++ b/packages/xorg-app/xrandr_cvs.bb
@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
-DEPENDS = "libxrandr libx11 libxext"
+DEPENDS = "libxrandr virtual/x11 libxext"
 DESCRIPTION = "X Resize and Rotate extension command."
 SECTION = "x11/base"
 
diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
index 39d6bce25f..7d8538be29 100644
--- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X server resource database utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "xrdb"
 
-DEPENDS += " libxmu libx11 libxext"
+DEPENDS += " libxmu virtual/x11 libxext"
 
diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
index 903474e054..9533003b8f 100644
--- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
@@ -4,4 +4,4 @@ DESCRIPTION = "X server resource database utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "xrdb"
 
-DEPENDS += " libxmu libx11 libxext"
+DEPENDS += " libxmu virtual/x11 libxext"
diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
index cbf2caac70..191eb9897f 100644
--- a/packages/xorg-app/xrdb_cvs.bb
+++ b/packages/xorg-app/xrdb_cvs.bb
@@ -1,5 +1,5 @@
 PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "libx11 libxmu libxext"
+DEPENDS = "virtual/x11 libxmu libxext"
 DESCRIPTION = "X server resource database utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
 
diff --git a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
index 058badcd6a..831e7de68f 100644
--- a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxaw libx11 libxt libxext xtrans xproxymngproto libxau"
+DEPENDS += " libxaw virtual/x11 libxt libxext xtrans xproxymngproto libxau"
 
diff --git a/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
index daf57d15c8..ca41d2373d 100644
--- a/packages/xorg-app/xset_20040817.bb
+++ b/packages/xorg-app/xset_20040817.bb
@@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
-DEPENDS = "libx11 libxext xextensions libxmu"
+DEPENDS = "virtual/x11 libxext xextensions libxmu"
 
 CFLAGS += "-D_GNU_SOURCE"
 
diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
index c8424cb12d..ca689e55f7 100644
--- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "user preference utility for X"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "MIT"
 
-DEPENDS += " libxmu libxext libx11 libxxf86misc libxfontcache libxp"
+DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp"
 
 SRC_URI += "file://disable-xkb.patch;patch=1"
 
diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
index c8424cb12d..ca689e55f7 100644
--- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "user preference utility for X"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "MIT"
 
-DEPENDS += " libxmu libxext libx11 libxxf86misc libxfontcache libxp"
+DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp"
 
 SRC_URI += "file://disable-xkb.patch;patch=1"
 
diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
index ca8816065c..6bd79a0eb8 100644
--- a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxi libx11"
+DEPENDS += " libxi virtual/x11"
 
diff --git a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
index ca8816065c..6bd79a0eb8 100644
--- a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxi libx11"
+DEPENDS += " libxi virtual/x11"
 
diff --git a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
index 8cf815f2f6..99061f45c4 100644
--- a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libx11 xbitmaps"
+DEPENDS += " libxmu virtual/x11 xbitmaps"
 
diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
index 14c99d3343..7bba2c74df 100644
--- a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libx11"
+DEPENDS += " libxmu virtual/x11"
 
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index 0738ffab02..aa34d9b106 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -3,7 +3,7 @@ SECTION = "x11/apps"
 #MAINTAINER = ""
 LICENSE = "MIT-X"
 
-DEPENDS = "xproto libx11 xextproto xext xau xpm ncurses"
+DEPENDS = "xproto virtual/x11 xextproto xext xau xpm ncurses"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/extras/${PN}-${PV}.tar.gz"
 
diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
index 76c1a1e3d4..fb3dca78a1 100644
--- a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxtrap"
+DEPENDS += " virtual/x11 libxtrap"
 
diff --git a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
index 76c1a1e3d4..fb3dca78a1 100644
--- a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11 libxtrap"
+DEPENDS += " virtual/x11 libxtrap"
 
diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
index b5caa9a7a1..4fdaf2427e 100644
--- a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxv libx11"
+DEPENDS += " libxv virtual/x11"
 
diff --git a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
index 14c99d3343..7bba2c74df 100644
--- a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libx11"
+DEPENDS += " libxmu virtual/x11"
 
diff --git a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
index 6662f1d710..a871a5c6e5 100644
--- a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libxext libx11"
+DEPENDS += " libxmu libxext virtual/x11"
 
diff --git a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
index 6662f1d710..a871a5c6e5 100644
--- a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libxmu libxext libx11"
+DEPENDS += " libxmu libxext virtual/x11"
 
diff --git a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
index a62b548b00..827257910a 100644
--- a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
@@ -2,5 +2,5 @@ include xorg-app-common.inc
 
 #DESCRIPTION = ""
 
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"