aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-07-26 17:07:51 +0000
committerJustin Patrin <papercrane@gmail.com>2006-07-26 17:07:51 +0000
commit175e2780753ef215331518d0c555657af95a48fa (patch)
tree8cfd943b2f1534bed1a40f49b0625bd21b5bbb5b
parent2163f23de82d09e0ef7517bf2cb76e6568c28691 (diff)
downloadopenembedded-175e2780753ef215331518d0c555657af95a48fa.tar.gz
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
-rw-r--r--packages/bzflag/bzflag_1.10.6.20040515.bb2
-rw-r--r--packages/cairo/cairo_0.5.0.bb4
-rw-r--r--packages/cairo/cairo_0.5.2.bb4
-rw-r--r--packages/cairo/cairo_0.9.2.bb2
-rw-r--r--packages/cairo/cairo_1.0.0.bb2
-rw-r--r--packages/cairo/cairo_1.0.2.bb2
-rw-r--r--packages/cairo/cairo_1.0.4.bb2
-rw-r--r--packages/cairo/cairo_1.2.0.bb2
-rw-r--r--packages/cairo/cairo_cvs.bb4
-rw-r--r--packages/detect-stylus/detect-stylus_0.10.bb2
-rw-r--r--packages/detect-stylus/detect-stylus_0.13.bb2
-rw-r--r--packages/efl/evas-x11_0.9.9.027.bb2
-rw-r--r--packages/efl/imlib2-x11_1.2.2.001.bb2
-rw-r--r--packages/emacs/emacs_cvs.bb4
-rw-r--r--packages/feh/feh_1.2.6.bb2
-rw-r--r--packages/feh/feh_1.2.7.bb2
-rw-r--r--packages/gnuplot/gnuplot_4.0.0.bb2
-rw-r--r--packages/gpe-autostarter/gpe-autostarter_0.11.bb2
-rw-r--r--packages/gpe-autostarter/gpe-autostarter_0.7.bb2
-rw-r--r--packages/gpe-soundserver/gpe-soundserver_0.4-1.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.30.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.31.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.33.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.41.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.42.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.43.bb2
-rw-r--r--packages/gpe-what/gpe-what_cvs.bb2
-rw-r--r--packages/ica/ica-bin_8.0.bb2
-rw-r--r--packages/icewm/icewm_1.2.20.bb2
-rw-r--r--packages/icewm/icewm_1.2.26.bb2
-rw-r--r--packages/ion/ion3_0.0+ds20041104.bb2
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.7-9.bb2
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.8.bb2
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.9.bb2
-rw-r--r--packages/juce/juce_1.29.bb2
-rw-r--r--packages/libmatchbox/libmatchbox.inc4
-rw-r--r--packages/libpixman/libpixman_0.1.5.bb2
-rw-r--r--packages/libpixman/libpixman_0.1.6.bb2
-rw-r--r--packages/libpixman/libpixman_cvs.bb2
-rw-r--r--packages/libsdl/libsdl-x11_1.2.7.bb2
-rw-r--r--packages/libsdl/libsdl-x11_1.2.9.bb2
-rw-r--r--packages/libvncserver/x11vnc_0.7.1.bb2
-rw-r--r--packages/libxine/libxine-x11_1.0.bb2
-rw-r--r--packages/libxine/libxine_1.1.0.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.12.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.13.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.14.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.16.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.17.bb2
-rw-r--r--packages/libxsettings/libxsettings_0.11.bb2
-rw-r--r--packages/lineak/lineak_0.8.3.bb2
-rw-r--r--packages/links/links-x11_2.1pre21.bb2
-rw-r--r--packages/links/links-x11_2.1pre22.bb2
-rw-r--r--packages/lirc/lirc_0.8.0.bb2
-rw-r--r--packages/maemo/osso-af-utils_0.4.bb4
-rw-r--r--packages/maemo/xpext_1.0-5.bb2
-rw-r--r--packages/maemo/xsp_1.0.0-8.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.8.1.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.8.3.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.8.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.1.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.8.3.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.8.4.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.2.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.3.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.4.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.5.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_1.0.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_svn.bb2
-rw-r--r--packages/mesa/mesa_6.4.1+cvs20060101.bb2
-rw-r--r--packages/miniclipboard/miniclipboard_0.3.bb2
-rw-r--r--packages/minipredict/minipredict.bb2
-rw-r--r--packages/mrxvt/mrxvt_0.4.1.bb2
-rw-r--r--packages/pango/pango_1.10.0.bb2
-rw-r--r--packages/pango/pango_1.10.2.bb2
-rw-r--r--packages/pango/pango_1.12.0.bb2
-rw-r--r--packages/pango/pango_1.13.2.bb2
-rw-r--r--packages/pango/pango_1.2.5.bb2
-rw-r--r--packages/pango/pango_1.4.0.bb2
-rw-r--r--packages/pango/pango_1.4.1.bb2
-rw-r--r--packages/pango/pango_1.8.0.bb2
-rw-r--r--packages/pango/pango_1.8.1.bb2
-rw-r--r--packages/pango/pango_1.8.2.bb2
-rw-r--r--packages/pango/pango_1.9.1.bb2
-rw-r--r--packages/qt/qt-x11-free_3.3.6.bb2
-rw-r--r--packages/qt/qt4-x11-free_4.1.2.bb2
-rw-r--r--packages/rdesktop/rdesktop_1.3.1.bb2
-rw-r--r--packages/rdesktop/rdesktop_1.4.1.bb2
-rw-r--r--packages/rdesktop/rdesktop_cvs.bb2
-rw-r--r--packages/rosetta/rosetta_cvs.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_4.8.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_4.9.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.2.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.3.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.4.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.6.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_7.7.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_cvs.bb2
-rw-r--r--packages/rxvt/rxvt_2.7.9.bb2
-rw-r--r--packages/startup-monitor/startup-monitor_0.18-2.bb2
-rw-r--r--packages/startup-notification/startup-notification_0.5.bb2
-rw-r--r--packages/startup-notification/startup-notification_0.8.bb2
-rw-r--r--packages/synergy/synergy_1.2.7.bb2
-rw-r--r--packages/tcltk/tk_8.4.11.bb2
-rw-r--r--packages/tetex/tetex_3.0.bb2
-rw-r--r--packages/uim/uim_1.1.0.bb2
-rw-r--r--packages/v4l2apps/v4l2apps_20020317.bb2
-rw-r--r--packages/vnc/tightvnc_1.3dev7.bb2
-rw-r--r--packages/xawtv/xawtv_3.93.bb2
-rw-r--r--packages/xcalibrate/xcalibrate_20060312.bb2
-rw-r--r--packages/xcalibrate/xcalibrate_cvs.bb2
-rw-r--r--packages/xcompmgr/xcompmgr_cvs.bb2
-rw-r--r--packages/xdemineur/xdemineur_2.1.1.bb2
-rw-r--r--packages/xfcalendar/xfcalendar.inc2
-rw-r--r--packages/xfcalendar/xfcalendar_4.2.0.bb2
-rw-r--r--packages/xfce-utils/xfce-utils.inc2
-rw-r--r--packages/xfce4-panel/xfce4-panel.inc2
-rw-r--r--packages/xfdesktop/xfdesktop.inc2
-rw-r--r--packages/xfdesktop/xfdesktop_4.2.0.bb2
-rw-r--r--packages/xfwm4/xfwm4.inc2
-rw-r--r--packages/xfwm4/xfwm4_4.2.0.bb2
-rw-r--r--packages/xmonobut/xmonobut_0.4.1.bb2
-rw-r--r--packages/xmonobut/xmonobut_0.4.bb2
-rw-r--r--packages/xorg-app/appres_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/beforelight_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/bitmap_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/bitmap_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/editres_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/ico_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/listres_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/luit_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/oclock_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/rgb_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/rstart_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/rstart_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/scripts_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/sessreg_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/twm_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/x11perf_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/x11perf_X11R7.1-1.4.1.bb2
-rw-r--r--packages/xorg-app/xauth_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xauth_cvs.bb2
-rw-r--r--packages/xorg-app/xclock_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xclock_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-app/xdm_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xdm_X11R7.1-1.0.4.bb2
-rw-r--r--packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xdpyinfo_cvs.bb2
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-app/xev_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xev_cvs.bb2
-rw-r--r--packages/xorg-app/xeyes_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xfwp_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xgamma_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xhost_20040413.bb2
-rw-r--r--packages/xorg-app/xhost_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/xhost_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-app/xinit_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xinit_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xkill_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-app/xmodmap_cvs.bb2
-rw-r--r--packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xpr_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xprop_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xprop_cvs.bb2
-rw-r--r--packages/xorg-app/xrandr_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xrandr_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xrandr_cvs.bb2
-rw-r--r--packages/xorg-app/xrdb_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xrdb_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xrdb_cvs.bb2
-rw-r--r--packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xrx_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xset_20040817.bb2
-rw-r--r--packages/xorg-app/xset_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xset_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xterm_207.bb2
-rw-r--r--packages/xorg-app/xtrap_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xtrap_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xwd_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xwud_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb2
-rw-r--r--packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb2
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-lib/libice_6.3.3.bb2
-rw-r--r--packages/xorg-lib/libice_cvs.bb2
-rw-r--r--packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libsm_6.0.3.bb2
-rw-r--r--packages/xorg-lib/libsm_cvs.bb2
-rw-r--r--packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libx11_6.2.1.bb2
-rw-r--r--packages/xorg-lib/libx11_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libx11_cvs.bb2
-rw-r--r--packages/xorg-lib/libx11_git.bb2
-rw-r--r--packages/xorg-lib/libxaw_7.0.2.bb2
-rw-r--r--packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxaw_cvs.bb2
-rw-r--r--packages/xorg-lib/libxcomposite_1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb2
-rw-r--r--packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb2
-rw-r--r--packages/xorg-lib/libxcomposite_cvs.bb2
-rw-r--r--packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb2
-rw-r--r--packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb2
-rw-r--r--packages/xorg-lib/libxdamage_1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb2
-rw-r--r--packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb2
-rw-r--r--packages/xorg-lib/libxdamage_cvs.bb2
-rw-r--r--packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxext-native_cvs.bb2
-rw-r--r--packages/xorg-lib/libxext_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxext_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxext_cvs.bb2
-rw-r--r--packages/xorg-lib/libxfixes_2.0.1.bb2
-rw-r--r--packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb2
-rw-r--r--packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb2
-rw-r--r--packages/xorg-lib/libxfixes_cvs.bb2
-rw-r--r--packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxft_2.1.6.bb2
-rw-r--r--packages/xorg-lib/libxft_cvs.bb2
-rw-r--r--packages/xorg-lib/libxi_6.0.1.bb2
-rw-r--r--packages/xorg-lib/libxi_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxi_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxi_cvs.bb2
-rw-r--r--packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb2
-rw-r--r--packages/xorg-lib/libxinerama_1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxinerama_cvs.bb2
-rw-r--r--packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb2
-rw-r--r--packages/xorg-lib/libxkbfile_cvs.bb2
-rw-r--r--packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxp_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxp_cvs.bb2
-rw-r--r--packages/xorg-lib/libxpm_3.5.1.bb2
-rw-r--r--packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb2
-rw-r--r--packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb2
-rw-r--r--packages/xorg-lib/libxpm_cvs.bb2
-rw-r--r--packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxrandr_1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb2
-rw-r--r--packages/xorg-lib/libxrandr_cvs.bb2
-rw-r--r--packages/xorg-lib/libxrender_0.8.4.bb2
-rw-r--r--packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb2
-rw-r--r--packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb2
-rw-r--r--packages/xorg-lib/libxrender_cvs.bb2
-rw-r--r--packages/xorg-lib/libxres_1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxres_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxres_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxres_cvs.bb2
-rw-r--r--packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb2
-rw-r--r--packages/xorg-lib/libxss_cvs.bb2
-rw-r--r--packages/xorg-lib/libxt_0.1.5.bb2
-rw-r--r--packages/xorg-lib/libxt_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxt_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxt_cvs.bb2
-rw-r--r--packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxtst_cvs.bb2
-rw-r--r--packages/xorg-lib/libxv_2.2.2+cvs20040918.bb2
-rw-r--r--packages/xorg-lib/libxv_2.2.2.bb2
-rw-r--r--packages/xorg-lib/libxv_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxvmc_20040919.bb2
-rw-r--r--packages/xorg-lib/libxvmc_20041025.bb2
-rw-r--r--packages/xorg-lib/libxvmc_20050612.bb2
-rw-r--r--packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxxf86dga_cvs.bb2
-rw-r--r--packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/libxxf86vm_cvs.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive_20050207.bb4
-rw-r--r--packages/xorg-xserver/xserver-kdrive_20050624.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive_20060312.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive_cvs.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb2
-rw-r--r--packages/xscreensaver/xscreensaver_4.16.bb2
-rw-r--r--packages/xscreensaver/xscreensaver_4.22.bb2
-rw-r--r--packages/xstroke/xstroke_0.6.bb2
-rw-r--r--packages/xtscal/xtscal_0.4.bb2
-rw-r--r--packages/xtscal/xtscal_0.5.1.bb2
-rw-r--r--packages/xtscal/xtscal_0.5.bb2
-rw-r--r--packages/xtscal/xtscal_0.6.3.bb2
342 files changed, 347 insertions, 351 deletions
diff --git a/packages/bzflag/bzflag_1.10.6.20040515.bb b/packages/bzflag/bzflag_1.10.6.20040515.bb
index 145b70bf95..a3a24fae31 100644
--- a/packages/bzflag/bzflag_1.10.6.20040515.bb
+++ b/packages/bzflag/bzflag_1.10.6.20040515.bb
@@ -1,4 +1,4 @@
-DEPENDS = "adns ncurses libx11"
+DEPENDS = "adns ncurses virtual/x11"
SECTION = "x11/games"
LICENSE = "LGPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2"
diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb
index 733aed045a..214fb07ca8 100644
--- a/packages/cairo/cairo_0.5.0.bb
+++ b/packages/cairo/cairo_0.5.0.bb
@@ -1,8 +1,8 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-# DEPENDS = "libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "libx11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r0"
diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb
index 733aed045a..214fb07ca8 100644
--- a/packages/cairo/cairo_0.5.2.bb
+++ b/packages/cairo/cairo_0.5.2.bb
@@ -1,8 +1,8 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-# DEPENDS = "libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "libx11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r0"
diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb
index 7d258cfb81..c34a429607 100644
--- a/packages/cairo/cairo_0.9.2.bb
+++ b/packages/cairo/cairo_0.9.2.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "libx11 libpng fontconfig libxrender"
+DEPENDS = "virtual/x11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r1"
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
index 10603e3f2f..09e8fa81b6 100644
--- a/packages/cairo/cairo_1.0.0.bb
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "libx11 libpng fontconfig libxrender"
+DEPENDS = "virtual/x11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r1"
diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb
index e15073ec0b..101a3e418e 100644
--- a/packages/cairo/cairo_1.0.2.bb
+++ b/packages/cairo/cairo_1.0.2.bb
@@ -1,6 +1,6 @@
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "libx11 libpng fontconfig libxrender"
+DEPENDS = "virtual/x11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r0"
diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb
index 61aefa91f5..c6ad012a24 100644
--- a/packages/cairo/cairo_1.0.4.bb
+++ b/packages/cairo/cairo_1.0.4.bb
@@ -1,6 +1,6 @@
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "libx11 libpng fontconfig libxrender"
+DEPENDS = "virtual/x11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
diff --git a/packages/cairo/cairo_1.2.0.bb b/packages/cairo/cairo_1.2.0.bb
index 61aefa91f5..c6ad012a24 100644
--- a/packages/cairo/cairo_1.2.0.bb
+++ b/packages/cairo/cairo_1.2.0.bb
@@ -1,6 +1,6 @@
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "libx11 libpng fontconfig libxrender"
+DEPENDS = "virtual/x11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
index c4908dafe6..45e277ef82 100644
--- a/packages/cairo/cairo_cvs.bb
+++ b/packages/cairo/cairo_cvs.bb
@@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-# DEPENDS = "libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "libx11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r2"
diff --git a/packages/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb
index bc7103cb24..75833b606e 100644
--- a/packages/detect-stylus/detect-stylus_0.10.bb
+++ b/packages/detect-stylus/detect-stylus_0.10.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
PR = "r2"
-DEPENDS = "libx11 xrdb xcursor-transparent-theme"
+DEPENDS = "virtual/x11 xrdb xcursor-transparent-theme"
RDEPENDS = "xrdb xcursor-transparent-theme"
SECTION = "gpe"
diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb
index 793cbef849..729a15de74 100644
--- a/packages/detect-stylus/detect-stylus_0.13.bb
+++ b/packages/detect-stylus/detect-stylus_0.13.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
PR = "r2"
-DEPENDS = "libx11 xcursor-transparent-theme xrdb"
+DEPENDS = "virtual/x11 xcursor-transparent-theme xrdb"
SECTION = "gpe"
RDEPENDS = "xrdb"
diff --git a/packages/efl/evas-x11_0.9.9.027.bb b/packages/efl/evas-x11_0.9.9.027.bb
index e130923816..b5318093a9 100644
--- a/packages/efl/evas-x11_0.9.9.027.bb
+++ b/packages/efl/evas-x11_0.9.9.027.bb
@@ -1,5 +1,5 @@
include evas.inc
-DEPENDS += "edb libx11 libxext freetype"
+DEPENDS += "edb virtual/x11 libxext freetype"
PR = "r7"
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb
index fec8b32205..38a9541fdf 100644
--- a/packages/efl/imlib2-x11_1.2.2.001.bb
+++ b/packages/efl/imlib2-x11_1.2.2.001.bb
@@ -1,5 +1,5 @@
include imlib2.inc
-DEPENDS += "libx11 libxext"
+DEPENDS += "virtual/x11 libxext"
PR = "r1"
EXTRA_OECONF = "--disable-mmx \
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index 1ee8d0ecbc..e1ab949d0a 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
SECTION = "editor"
# full X (non-diet) is needed for X support
-#DEPENDS = "libx11"
+DEPENDS = "libx11"
# and it needs to run some generated binaries..
DEPENDS += "qemu-native"
PR = "r2"
@@ -16,7 +16,7 @@ S = "${WORKDIR}/emacs"
inherit autotools
-EXTRA_OECONF = "--without-x"
+#EXTRA_OECONF = "--without-x"
#QEMU = "/usr/bin/qemu-arm -L ${WORKDIR}/usr/local/gnemul/qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb
index 1d2fcaaf07..ce0f510c85 100644
--- a/packages/feh/feh_1.2.6.bb
+++ b/packages/feh/feh_1.2.6.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "MIT"
-DEPENDS = "imlib2 giblib jpeg libx11 libxext libxt"
+DEPENDS = "imlib2 giblib jpeg virtual/x11 libxext libxt"
SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
file://cross.patch;patch=1"
diff --git a/packages/feh/feh_1.2.7.bb b/packages/feh/feh_1.2.7.bb
index 1d2fcaaf07..ce0f510c85 100644
--- a/packages/feh/feh_1.2.7.bb
+++ b/packages/feh/feh_1.2.7.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "MIT"
-DEPENDS = "imlib2 giblib jpeg libx11 libxext libxt"
+DEPENDS = "imlib2 giblib jpeg virtual/x11 libxext libxt"
SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
file://cross.patch;patch=1"
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index f5bc5fc740..c742177499 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "console/scientific"
LICENSE = "BSD-4"
PRIORITY = "optional"
MAINTAINER = "Philip Frampton"
-DEPENDS = "libx11 libpng gd readline"
+DEPENDS = "virtual/x11 libpng gd readline"
PR = "r3"
SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index 0921ec25a4..3cdd2b6b76 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -1,5 +1,5 @@
SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus libx11"
+DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/x11"
RDEPENDS = "hotplug-dbus"
LICENSE = "GPL"
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.7.bb b/packages/gpe-autostarter/gpe-autostarter_0.7.bb
index 847e961cce..1f6ef0f7cc 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.7.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.7.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus libx11"
+DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/x11"
RDEPENDS = "hotplug-dbus"
inherit gpe
diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
index 253eda0502..5f62983faa 100644
--- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
+++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
SECTION = "gpe"
inherit gpe
-DEPENDS = "libx11 esound-gpe"
+DEPENDS = "virtual/x11 esound-gpe"
RDEPENDS_${PN} = "esd"
SRC_URI += "file://makefile-breakage.patch;patch=1"
diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb
index 4bd9e5e779..d9d800e38b 100644
--- a/packages/gpe-what/gpe-what_0.30.bb
+++ b/packages/gpe-what/gpe-what_0.30.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
inherit gpe
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
do_compile_prepend() {
diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb
index e660eea21b..a82e6e26cb 100644
--- a/packages/gpe-what/gpe-what_0.31.bb
+++ b/packages/gpe-what/gpe-what_0.31.bb
@@ -3,5 +3,5 @@ SECTION = "gpe"
inherit gpe
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11 libxpm libmatchbox"
+DEPENDS = "virtual/x11 libxpm libmatchbox"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb
index 98710f551f..ed72a37b1e 100644
--- a/packages/gpe-what/gpe-what_0.33.bb
+++ b/packages/gpe-what/gpe-what_0.33.bb
@@ -5,5 +5,5 @@ inherit gpe
SRC_URI += "file://makefile-fix.patch;patch=1"
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11 libxpm libmatchbox"
+DEPENDS = "virtual/x11 libxpm libmatchbox"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb
index 383e31995f..f8d824cae3 100644
--- a/packages/gpe-what/gpe-what_0.41.bb
+++ b/packages/gpe-what/gpe-what_0.41.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11 gtk+"
+DEPENDS = "virtual/x11 gtk+"
GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb
index 383e31995f..f8d824cae3 100644
--- a/packages/gpe-what/gpe-what_0.42.bb
+++ b/packages/gpe-what/gpe-what_0.42.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11 gtk+"
+DEPENDS = "virtual/x11 gtk+"
GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb
index 383e31995f..f8d824cae3 100644
--- a/packages/gpe-what/gpe-what_0.43.bb
+++ b/packages/gpe-what/gpe-what_0.43.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11 gtk+"
+DEPENDS = "virtual/x11 gtk+"
GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb
index 3da6662afb..e21769f33a 100644
--- a/packages/gpe-what/gpe-what_cvs.bb
+++ b/packages/gpe-what/gpe-what_cvs.bb
@@ -10,4 +10,4 @@ inherit autotools gpe
SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
DESCRIPTION = "GPE modal help"
-DEPENDS = "libx11 gtk+"
+DEPENDS = "virtual/x11 gtk+"
diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb
index af5b380662..edd0bfdd10 100644
--- a/packages/ica/ica-bin_8.0.bb
+++ b/packages/ica/ica-bin_8.0.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
-DEPENDS="libx11 libxaw rpm2cpio-native"
+DEPENDS = "virtual/x11 libxaw rpm2cpio-native"
MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
HOMEPAGE="www.citrix.com/download/"
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index dfe87335b3..ee444faf06 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "IceWM Window Manager"
LICENSE = "GPL"
-DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
+DEPENDS = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb
index 7c1e2a2bf7..60e3a9a867 100644
--- a/packages/icewm/icewm_1.2.26.bb
+++ b/packages/icewm/icewm_1.2.26.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "IceWM Window Manager"
LICENSE = "GPL"
-DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
+DEPENDS = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb
index 1c80cdf2fa..919fa64e34 100644
--- a/packages/ion/ion3_0.0+ds20041104.bb
+++ b/packages/ion/ion3_0.0+ds20041104.bb
@@ -1,7 +1,7 @@
BROKEN = "1"
# is unfetchable now - upstream updated to 20050728
-DEPENDS += "lua-native lua libx11 libxext"
+DEPENDS += "lua-native lua virtual/x11 libxext"
DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \
users in mind."
HOMEPAGE = "http://modeemi.fi/~tuomov/ion/"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
index bdf0295c98..5a246f4a08 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
@@ -4,7 +4,7 @@ PR = "r3"
inherit gpe pkgconfig
-DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.8.bb b/packages/ipaq-sleep/ipaq-sleep_0.8.bb
index a63ec83a7c..4d531f49ce 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.8.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.8.bb
@@ -2,7 +2,7 @@
LICENSE = "GPL"
inherit gpe pkgconfig
-DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
index 17d80eff69..3455571613 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -2,7 +2,7 @@
LICENSE = "GPL"
inherit gpe pkgconfig
-DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions virtual/x11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb
index 0127a355a0..6ba72a50c3 100644
--- a/packages/juce/juce_1.29.bb
+++ b/packages/juce/juce_1.29.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.rawmaterialsoftware.com/juce"
AUTHOR = "Julian Stoerer"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-DEPENDS = "alsa-lib freetype x11"
+DEPENDS = "alsa-lib freetype virtual/x11"
PR = "r0"
#FIXME the patches are a) HACKS and b) something's wrong with lineend conversion
diff --git a/packages/libmatchbox/libmatchbox.inc b/packages/libmatchbox/libmatchbox.inc
index 974014f276..1a33fac5af 100644
--- a/packages/libmatchbox/libmatchbox.inc
+++ b/packages/libmatchbox/libmatchbox.inc
@@ -1,8 +1,8 @@
SECTION = "x11/libs"
DESCRIPTION = "Matchbox window manager core library"
LICENSE = "GPL"
-DEPENDS = "libx11 libxext expat libxft jpeg libpng zlib libxsettings-client"
-PR="r2"
+DEPENDS = "virtual/x11 libxext expat libxft jpeg libpng zlib libxsettings-client"
+PR = "r2"
inherit autotools pkgconfig
diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb
index 5427c90864..2725031201 100644
--- a/packages/libpixman/libpixman_0.1.5.bb
+++ b/packages/libpixman/libpixman_0.1.5.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
DESCRIPTION = "Cairo support library"
LICENSE = "X11"
SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz"
diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb
index 5427c90864..2725031201 100644
--- a/packages/libpixman/libpixman_0.1.6.bb
+++ b/packages/libpixman/libpixman_0.1.6.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
DESCRIPTION = "Cairo support library"
LICENSE = "X11"
SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz"
diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb
index 1f04e51fad..cd59c7b050 100644
--- a/packages/libpixman/libpixman_cvs.bb
+++ b/packages/libpixman/libpixman_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
DESCRIPTION = "Cairo support library"
LICENSE = "X11"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman"
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index 2bdf6933a0..a29a56adab 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libxext"
+DEPENDS = "virtual/x11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
index 50c1439410..986dba6da0 100644
--- a/packages/libsdl/libsdl-x11_1.2.9.bb
+++ b/packages/libsdl/libsdl-x11_1.2.9.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "alsa-lib libx11 libxext"
+DEPENDS = "alsa-lib virtual/x11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
diff --git a/packages/libvncserver/x11vnc_0.7.1.bb b/packages/libvncserver/x11vnc_0.7.1.bb
index 61647eb571..073c977ddb 100644
--- a/packages/libvncserver/x11vnc_0.7.1.bb
+++ b/packages/libvncserver/x11vnc_0.7.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "X11 VNC server"
SECTION = "x11"
PRIORITY = "optional"
-DEPENDS = "zlib jpeg libx11"
+DEPENDS = "zlib jpeg virtual/x11"
LICENSE = "GPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index 03a47474b0..4f76bde334 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe libx11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/x11 libxext"
PROVIDES = "virtual/libxine"
PR = "r0"
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index cd2a628f3b..0012301a16 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe libx11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/x11 libxext"
PROVIDES = "virtual/libxine"
PR = "r0"
diff --git a/packages/libxsettings-client/libxsettings-client_0.12.bb b/packages/libxsettings-client/libxsettings-client_0.12.bb
index 3c3103722b..5b707c074f 100644
--- a/packages/libxsettings-client/libxsettings-client_0.12.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.12.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libgpewidget libxsettings libx11"
+DEPENDS = "libgpewidget libxsettings virtual/x11"
inherit pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.13.bb b/packages/libxsettings-client/libxsettings-client_0.13.bb
index 1eed6f7db1..14c9e6544e 100644
--- a/packages/libxsettings-client/libxsettings-client_0.13.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.13.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libgpewidget libxsettings libx11"
+DEPENDS = "libgpewidget libxsettings virtual/x11"
inherit pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
index f2e77735f9..f47b99f849 100644
--- a/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings libx11 libxt"
+DEPENDS = "libxsettings virtual/x11 libxt"
# libxt is required to stop configure breaking builds by
# including system paths to find it if it isn't present.
diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index 45d9b1c307..15786d5d87 100644
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings libx11 libxt"
+DEPENDS = "libxsettings virtual/x11 libxt"
# libxt is required to stop configure breaking builds by
# including system paths to find it if it isn't present.
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb
index ed1503d5d2..6c60c0499e 100644
--- a/packages/libxsettings-client/libxsettings-client_0.17.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.17.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings libx11 libxt gtk-doc"
+DEPENDS = "libxsettings virtual/x11 libxt gtk-doc"
# libxt is required to stop configure breaking builds by
# including system paths to find it if it isn't present.
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
diff --git a/packages/libxsettings/libxsettings_0.11.bb b/packages/libxsettings/libxsettings_0.11.bb
index caf2bc67ae..867bcb1355 100644
--- a/packages/libxsettings/libxsettings_0.11.bb
+++ b/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 = "libx11"
+DEPENDS = "virtual/x11"
inherit gpe
diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb
index 111708d732..b2c2e6d4f0 100644
--- a/packages/lineak/lineak_0.8.3.bb
+++ b/packages/lineak/lineak_0.8.3.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/multimedia"
HOMEPAGE = "http://lineak.sourceforge.net"
LICENSE = "GPLv2"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-DEPENDS = "libx11 libxext"
+DEPENDS = "virtual/x11 libxext"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \
diff --git a/packages/links/links-x11_2.1pre21.bb b/packages/links/links-x11_2.1pre21.bb
index f763df7f60..6854248de2 100644
--- a/packages/links/links-x11_2.1pre21.bb
+++ b/packages/links/links-x11_2.1pre21.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "console/network"
-DEPENDS = "jpeg libpng flex openssl zlib libx11"
+DEPENDS = "jpeg libpng flex openssl zlib virtual/x11"
DESCRIPTION = "Links is graphics and text mode WWW \
browser, similar to Lynx."
RCONFLICTS = "links"
diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb
index f763df7f60..6854248de2 100644
--- a/packages/links/links-x11_2.1pre22.bb
+++ b/packages/links/links-x11_2.1pre22.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "console/network"
-DEPENDS = "jpeg libpng flex openssl zlib libx11"
+DEPENDS = "jpeg libpng flex openssl zlib virtual/x11"
DESCRIPTION = "Links is graphics and text mode WWW \
browser, similar to Lynx."
RCONFLICTS = "links"
diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb
index 7aeccdcbb9..43253937b2 100644
--- a/packages/lirc/lirc_0.8.0.bb
+++ b/packages/lirc/lirc_0.8.0.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.lirc.org"
MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
LICENSE = "GPL"
-DEPENDS = "virtual/kernel libx11 libxau libsm libice"
+DEPENDS = "virtual/kernel virtual/x11 libxau libsm libice"
DEPENDS_nslu2 = "virtual/kernel lirc-modules"
RDEPENDS = "lirc-modules"
RDEPENDS_lirc-x = "lirc"
diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb
index 54f2305b17..2ffa19b6bc 100644
--- a/packages/maemo/osso-af-utils_0.4.bb
+++ b/packages/maemo/osso-af-utils_0.4.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
-MAINTAINER= "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "libx11 dbus libosso"
+DEPENDS = "virtual/x11 dbus libosso"
SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz"
inherit autotools pkgconfig
diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb
index 75b7903e84..b8ee5d9b98 100644
--- a/packages/maemo/xpext_1.0-5.bb
+++ b/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 = "libx11 xextensions libxext"
+DEPENDS = "virtual/x11 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/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index 068193c6aa..d797724f4c 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/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 = "libx11 xextensions libxext xpext"
+DEPENDS = "virtual/x11 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/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index 75609a598e..3f836a32bb 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
PR = "r4"
DESCRIPTION = "Matchbox panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
file://automake-lossage.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
index 8726982c70..dd991ddbaa 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
SECTION = "x11/wm"
PR = "r1"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb
index 331c049468..361a901597 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.bb
@@ -1,7 +1,7 @@
SECTION = "x11/utils"
DESCRIPTION = "Matchbox panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm"
+DEPENDS = "libmatchbox virtual/x11 libxext libxpm"
RDEPENDS = "libmatchbox matchbox-common"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
index d1c263db38..fa68298a37 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
SECTION = "x11/wm"
PR = "r2"
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.bb b/packages/matchbox-panel/matchbox-panel_0.9.bb
index 725fe257e1..9b36f17692 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
SECTION = "x11/wm"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz"
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
index 5db605cd0d..af791cbe23 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
index 5db605cd0d..af791cbe23 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
index 359ab819ec..7f8b768106 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR = "r1"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
index 1e8779fa34..b858153b8f 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR = "r2"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
index 0ee65e689d..05f006c195 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index 358e62a9de..06cd29eb6b 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR="r0"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb
index 4db68fcf94..ddc3dccd62 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz"
diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb
index a464dcfcdd..88c04d9473 100644
--- a/packages/matchbox-wm/matchbox-wm_1.0.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.0.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR="r1"
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index c17ce96252..5720c23392 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PV = "0.9.5+svn${SRCDATE}"
PR = "r2"
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
index 164f62648f..b3fccad992 100644
--- a/packages/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/Mesa"
LICENSE = "LGPL"
RDEPENDS = "expat"
-DEPENDS = "makedepend-native xf86vidmodeproto glproto libx11 libxext libxxf86vm libxi libxmu libice"
+DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/x11 libxext libxxf86vm libxi libxmu libice"
# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb
index 885f5a7d20..f0e5e46d6e 100644
--- a/packages/miniclipboard/miniclipboard_0.3.bb
+++ b/packages/miniclipboard/miniclipboard_0.3.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
inherit gpe
LICENSE = "LGPL"
DESCRIPTION = "Clipboard management application"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
RDEPENDS = "gdk-pixbuf-loader-xpm"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
PR = "r1"
diff --git a/packages/minipredict/minipredict.bb b/packages/minipredict/minipredict.bb
index ded01f503e..df8cfe7781 100644
--- a/packages/minipredict/minipredict.bb
+++ b/packages/minipredict/minipredict.bb
@@ -1,7 +1,7 @@
inherit gpe pkgconfig
DESCRIPTION = "Minipredict is a app that sits above the dock, e.g. mbdock, and suggests words for completion."
-DEPENDS = "libx11 libxext gtk+ libdictionary zlib"
+DEPENDS = "virtual/x11 libxext gtk+ libdictionary zlib"
SECTION = "gpe"
PRIORITY = "optional"
diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb
index 09ea06f98d..f4f34a672c 100644
--- a/packages/mrxvt/mrxvt_0.4.1.bb
+++ b/packages/mrxvt/mrxvt_0.4.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://materm.sourceforge.net"
AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>"
LICENSE = "GPL"
SECTION = "x11/apps"
-DEPENDS = "libx11 libxext libxpm jpeg libpng"
+DEPENDS = "virtual/x11 libxext libxpm jpeg libpng"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb
index 5898eae40e..4be6047ffa 100644
--- a/packages/pango/pango_1.10.0.bb
+++ b/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 libx11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 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/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index e9da77c13a..3006b41970 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.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 libx11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 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/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index 704bf4ffc5..8859f6b873 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/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 libx11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 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/packages/pango/pango_1.13.2.bb b/packages/pango/pango_1.13.2.bb
index ae3cd003d9..dda2cf7d1c 100644
--- a/packages/pango/pango_1.13.2.bb
+++ b/packages/pango/pango_1.13.2.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 virtual/x11 libxft xt 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/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb
index 1380a6af52..bf66887e9f 100644
--- a/packages/pango/pango_1.2.5.bb
+++ b/packages/pango/pango_1.2.5.bb
@@ -1,6 +1,6 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
-DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt"
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/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb
index 8d165989c8..1e53f049d4 100644
--- a/packages/pango/pango_1.4.0.bb
+++ b/packages/pango/pango_1.4.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 libx11 libxft libxt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt"
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/packages/pango/pango_1.4.1.bb b/packages/pango/pango_1.4.1.bb
index 10e5bc3f69..52007acf78 100644
--- a/packages/pango/pango_1.4.1.bb
+++ b/packages/pango/pango_1.4.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 libx11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 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/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb
index a692fd7299..55dac29f25 100644
--- a/packages/pango/pango_1.8.0.bb
+++ b/packages/pango/pango_1.8.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 libx11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 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/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb
index a692fd7299..55dac29f25 100644
--- a/packages/pango/pango_1.8.1.bb
+++ b/packages/pango/pango_1.8.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 libx11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 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/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index 3ab63077bf..7dad993d9c 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.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 libx11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc"
RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb
index 7f7fdd1e26..d110d0a76d 100644
--- a/packages/pango/pango_1.9.1.bb
+++ b/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 libx11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/x11 libxft libxt gtk-doc"
RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index 65b8723c2f..6509bac524 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL QPL"
HOMEPAGE = "http://www.trolltech.com"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "uicmoc3-native freetype libx11 xft libxext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc3-native freetype virtual/x11 xft libxext libxrender libxrandr libxcursor mysql"
PROVIDES = "qt3x11"
PR = "r0"
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb
index 9bff5f1c5c..128413d166 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt/qt4-x11-free_4.1.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor"
+DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/x11 xft libxext libxrender libxrandr libxcursor"
PROVIDES = "qt4x11"
PR = "r1"
diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index 43cee1b303..7695b336d3 100644
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "RDesktop is a X11 based RDP client"
HOMEPAGE = "http://www.rdesktop.org/"
LICENSE = "GPL"
-DEPENDS = "libx11 openssl"
+DEPENDS = "virtual/x11 openssl"
RDEPENDS= "openssl"
SECTION = "x11/network"
diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index fd60ac5b13..5d0dff6627 100644
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "libx11 openssl"
+DEPENDS = "virtual/x11 openssl"
HOMEPAGE = "http://www.rdesktop.org"
SECTION = "x11/network"
MAINTAINER = "Adrian Davey <ade@beth2.org>"
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index 00c2423f85..0568789afa 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "libx11 openssl"
+DEPENDS = "virtual/x11 openssl"
HOMEPAGE = "http://www.rdesktop.org"
SECTION = "x11/network"
MAINTAINER = "Adrian Davey <ade@beth2.org>"
diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb
index ff320a96b5..06f8d8c73c 100644
--- a/packages/rosetta/rosetta_cvs.bb
+++ b/packages/rosetta/rosetta_cvs.bb
@@ -1,6 +1,6 @@
SECTION = "x11/utils"
PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "gtk+ libgpewidget libx11 libxrandr libxft libxtst libxext libxau \
+DEPENDS = "gtk+ libgpewidget virtual/x11 libxrandr libxft libxtst libxext libxau \
virtual/libintl"
DESCRIPTION = "Multistroke / full word handwriting recognition for X"
LICENSE = "GPL"
diff --git a/packages/rxvt-unicode/rxvt-unicode_4.8.bb b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
index 2174ccb6d6..5ba2b23616 100644
--- a/packages/rxvt-unicode/rxvt-unicode_4.8.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt-unicode/rxvt-unicode_4.9.bb b/packages/rxvt-unicode/rxvt-unicode_4.9.bb
index 6dbedf2c83..dd3cf46c2c 100644
--- a/packages/rxvt-unicode/rxvt-unicode_4.9.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_4.9.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt-unicode/rxvt-unicode_5.2.bb b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
index ac891b6a3b..001da697ad 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.2.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
index 6ceefddd89..2825fb015f 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.3.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt-unicode/rxvt-unicode_5.4.bb b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
index 6ceefddd89..2825fb015f 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.4.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 9351a96a98..296582ef73 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb
index 345a52aebb..e6c3c165a3 100644
--- a/packages/rxvt-unicode/rxvt-unicode_7.7.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_7.7.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft libxpm"
+DEPENDS = "virtual/x11 libxt libxft libxpm"
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/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb
index 8059c5d489..73674bac92 100644
--- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "libx11 libxt libxft"
+DEPENDS = "virtual/x11 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/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb
index 20b3e28ff7..0093a218fd 100644
--- a/packages/rxvt/rxvt_2.7.9.bb
+++ b/packages/rxvt/rxvt_2.7.9.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Well known terminal emulator"
SECTION = "x11/utils"
PR = "r1"
-DEPENDS = "libx11 libxft"
+DEPENDS = "virtual/x11 libxft"
LICENSE = "GPL"
SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
file://include.patch;patch=1"
diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb
index 9eb48b6369..b056ea9441 100644
--- a/packages/startup-monitor/startup-monitor_0.18-2.bb
+++ b/packages/startup-monitor/startup-monitor_0.18-2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-DEPENDS = "libx11 startup-notification glib-2.0 libmatchbox"
+DEPENDS = "virtual/x11 startup-notification glib-2.0 libmatchbox"
inherit gpe pkgconfig
diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb
index e59056ab56..d04c6da160 100644
--- a/packages/startup-notification/startup-notification_0.5.bb
+++ b/packages/startup-notification/startup-notification_0.5.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
inherit autotools pkgconfig
diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb
index e7649bd65d..d847de20d0 100644
--- a/packages/startup-notification/startup-notification_0.8.bb
+++ b/packages/startup-notification/startup-notification_0.8.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
inherit autotools pkgconfig
diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb
index 738139428d..50cf20ee47 100644
--- a/packages/synergy/synergy_1.2.7.bb
+++ b/packages/synergy/synergy_1.2.7.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
SECTION = "x11"
# NOTE: This depends on full x11, not diet-x11
DEPENDS = "libx11 libxtst"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz"
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index 09b7c94320..c8b3ac0d3a 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language ToolKit Extension"
LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
-DEPENDS = "tcl libx11 libxt"
+DEPENDS = "tcl virtual/x11 libxt"
RDEPENDS = "tcl"
PR = "r4"
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index f12840fd47..ad0e0f23f2 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/tetex/tetex_3.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible
HOMEPAGE = "http://www.tug.org/tetex"
LICENSE = "GPL"
SECTION = "console/utils"
-DEPENDS = "tetex-native flex gd ncurses libpng t1lib libx11 libxau libxext libxt zlib"
+DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/x11 libxau libxext libxt zlib"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
PR = "r5"
diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb
index ea549c5451..59cba88047 100644
--- a/packages/uim/uim_1.1.0.bb
+++ b/packages/uim/uim_1.1.0.bb
@@ -1,5 +1,5 @@
require uim.inc
-DEPENDS = "gtk+ uim-native anthy fontconfig x11 libxft xt glib-2.0 ncurses"
+DEPENDS = "gtk+ uim-native anthy fontconfig virtual/x11 libxft xt glib-2.0 ncurses"
SRC_URI += "file://uim-module-manager.patch;patch=1"
diff --git a/packages/v4l2apps/v4l2apps_20020317.bb b/packages/v4l2apps/v4l2apps_20020317.bb
index 779372a775..0206863f93 100644
--- a/packages/v4l2apps/v4l2apps_20020317.bb
+++ b/packages/v4l2apps/v4l2apps_20020317.bb
@@ -1,7 +1,7 @@
SECTION = "console/utils"
DESCRIPTION = "Video4linux Two sample applications"
LICENSE = "PD"
-DEPENDS = "libxaw libx11 libxt"
+DEPENDS = "libxaw virtual/x11 libxt"
SRC_URI = "http://www.thedirks.org/pub/v4l2/apps/apps${PV}.tgz"
S = "${WORKDIR}"
diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb
index 54503ee408..a79f100230 100644
--- a/packages/vnc/tightvnc_1.3dev7.bb
+++ b/packages/vnc/tightvnc_1.3dev7.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "A Unix VNC client"
HOMEPAGE = "http://www.tightvnc.com/"
-DEPENDS = "libx11 zlib libxmu libxaw"
+DEPENDS = "virtual/x11 zlib libxmu libxaw"
LICENSE = "GPL"
MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
diff --git a/packages/xawtv/xawtv_3.93.bb b/packages/xawtv/xawtv_3.93.bb
index d2bd5d2a93..18ff27b428 100644
--- a/packages/xawtv/xawtv_3.93.bb
+++ b/packages/xawtv/xawtv_3.93.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \
driver or video4linux. It also contains various command-line utilities for \
grabbing images and AVI movies, tuning in TV stations, etc."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "libxaw libxmu libxt libxpm libxext libx11 ncurses libxft fs jpeg"
+DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/x11 ncurses libxft fs jpeg"
SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \
file://make.patch;patch=1"
diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb
index 16e9642765..7239275f21 100644
--- a/packages/xcalibrate/xcalibrate_20060312.bb
+++ b/packages/xcalibrate/xcalibrate_20060312.bb
@@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
LICENSE = "BSD-X"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "libx11 xcalibrateext libxext"
+DEPENDS = "virtual/x11 xcalibrateext libxext"
DESCRIPTION = "XCalibrate client-side library"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index ea69ec6f2d..98c493f3ca 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "BSD-X"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "libx11 xcalibrateext libxext"
+DEPENDS = "virtual/x11 xcalibrateext libxext"
DESCRIPTION = "XCalibrate client-side library"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb
index 451f289611..ba2550261d 100644
--- a/packages/xcompmgr/xcompmgr_cvs.bb
+++ b/packages/xcompmgr/xcompmgr_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD-X"
SECTION = "x11"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libxdamage libxcomposite libxrender"
+DEPENDS = "virtual/x11 libxdamage libxcomposite libxrender"
DESCRIPTION = "X Compositing Manager"
SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr"
diff --git a/packages/xdemineur/xdemineur_2.1.1.bb b/packages/xdemineur/xdemineur_2.1.1.bb
index 2e4b59151c..ffd6b3a918 100644
--- a/packages/xdemineur/xdemineur_2.1.1.bb
+++ b/packages/xdemineur/xdemineur_2.1.1.bb
@@ -1,7 +1,7 @@
inherit gpe
LICENSE = "BSD-X"
-DEPENDS = "libx11 libxpm"
+DEPENDS = "virtual/x11 libxpm"
SECTION = "gpe"
DESCRIPTION = "Mine-sweeper game for GPE."
PRIORITY = "optional"
diff --git a/packages/xfcalendar/xfcalendar.inc b/packages/xfcalendar/xfcalendar.inc
index 9dc7b6ef53..8a1a5b7e20 100644
--- a/packages/xfcalendar/xfcalendar.inc
+++ b/packages/xfcalendar/xfcalendar.inc
@@ -4,5 +4,5 @@
DESCRIPTION="XFCE Calendar"
SECTION = "x11"
-DEPENDS="x11 libxfcegui4 libxfce4mcs"
+DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs"
inherit xfce
diff --git a/packages/xfcalendar/xfcalendar_4.2.0.bb b/packages/xfcalendar/xfcalendar_4.2.0.bb
index 07b9b75000..8a1a5b7e20 100644
--- a/packages/xfcalendar/xfcalendar_4.2.0.bb
+++ b/packages/xfcalendar/xfcalendar_4.2.0.bb
@@ -4,5 +4,5 @@
DESCRIPTION="XFCE Calendar"
SECTION = "x11"
-DEPENDS="libx11 libxfcegui4 libxfce4mcs"
+DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs"
inherit xfce
diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc
index 6c6ddc2fbd..a4b3958493 100644
--- a/packages/xfce-utils/xfce-utils.inc
+++ b/packages/xfce-utils/xfce-utils.inc
@@ -3,7 +3,7 @@
# Released under the MIT license (see packages/COPYING)
DESCRIPTION="XFCE4 Utilities"
-DEPENDS="x11 libxfcegui4 xfce-mcs-manager"
+DEPENDS = "virtual/x11 libxfcegui4 xfce-mcs-manager"
inherit xfce
FILES_${PN} += " /usr/share/xfce4/AUTHORS \
diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc
index 5510a13a09..573e2bdaa3 100644
--- a/packages/xfce4-panel/xfce4-panel.inc
+++ b/packages/xfce4-panel/xfce4-panel.inc
@@ -4,7 +4,7 @@
DESCRIPTION = "XFCE4 Panel"
SECTION = "x11"
-DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
+DEPENDS = "startup-notification virtual/x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
inherit pkgconfig xfce
diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc
index 4b6fd23205..1b22894fed 100644
--- a/packages/xfdesktop/xfdesktop.inc
+++ b/packages/xfdesktop/xfdesktop.inc
@@ -4,7 +4,7 @@
DESCRIPTION="xfce4 Desktop Background Manager"
SECTION = "x11/base"
-DEPENDS="x11 libxfcegui4 libxfce4mcs libxml2"
+DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2"
inherit xfce
PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"
diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb
index e053a47fc0..4c56b459a3 100644
--- a/packages/xfdesktop/xfdesktop_4.2.0.bb
+++ b/packages/xfdesktop/xfdesktop_4.2.0.bb
@@ -4,7 +4,7 @@
DESCRIPTION="xfce4 Desktop Background Manager"
SECTION = "x11/base"
-DEPENDS="libx11 libxfcegui4 libxfce4mcs libxml2"
+DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2"
inherit xfce
PACKAGES += "xfdesktop-backdrops"
diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc
index 5364466f5a..5af8a5f18b 100644
--- a/packages/xfwm4/xfwm4.inc
+++ b/packages/xfwm4/xfwm4.inc
@@ -8,7 +8,7 @@ inherit xfce
FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-DEPENDS="startup-notification x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+DEPENDS = "startup-notification virtual/x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
EXTRA_OECONF += " --enable-startup-notification"
diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb
index 71a46646ea..f23227ae60 100644
--- a/packages/xfwm4/xfwm4_4.2.0.bb
+++ b/packages/xfwm4/xfwm4_4.2.0.bb
@@ -9,7 +9,7 @@ inherit xfce
FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-DEPENDS="startup-notification libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+DEPENDS = "startup-notification virtual/x11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
EXTRA_OECONF += " --enable-startup-notification"
diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb
index a0800f7010..6f3bf8888a 100644
--- a/packages/xmonobut/xmonobut_0.4.1.bb
+++ b/packages/xmonobut/xmonobut_0.4.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
PR = "r1"
DESCRIPTION = "utility to allow middle and right clicking with a stylus"
SECTION = "x11/utils"
-DEPENDS = "libx11 libxext libxpm libmatchbox"
+DEPENDS = "virtual/x11 libxext libxpm libmatchbox"
SRC_URI = "http://www.handhelds.org/~philippe/sources/xmonobut-${PV}.tar.gz \
file://xmonobut.desktop"
inherit autotools
diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb
index e4907831f6..fb377cb179 100644
--- a/packages/xmonobut/xmonobut_0.4.bb
+++ b/packages/xmonobut/xmonobut_0.4.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
PR = "r1"
DESCRIPTION = "utility to allow middle and right clicking with a stylus"
SECTION = "x11/utils"
-DEPENDS = "libx11 libxext libxpm"
+DEPENDS = "virtual/x11 libxext libxpm"
SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \
file://xmonobut.desktop"
inherit autotools
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"
diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb
index 0e39496e3a..6ec014854c 100644
--- a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb
+++ b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb
@@ -2,5 +2,5 @@ include xorg-driver-video.inc
DESCRIPTION = "I810 for X11"
-DEPENDS += " libx11 libxvmc drm xf86driproto"
+DEPENDS += " virtual/x11 libxvmc drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb
index 0e39496e3a..6ec014854c 100644
--- a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb
+++ b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb
@@ -2,5 +2,5 @@ include xorg-driver-video.inc
DESCRIPTION = "I810 for X11"
-DEPENDS += " libx11 libxvmc drm xf86driproto"
+DEPENDS += " virtual/x11 libxvmc drm xf86driproto"
diff --git a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
index 3e09f9a4b8..272dbd6f96 100644
--- a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
@@ -1,8 +1,6 @@
SECTION = "x11/base"
include libx11_${PV}.bb
-PROVIDES += "libx11"
-
EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index 747c525535..8a44835502 100644
--- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -1,8 +1,6 @@
SECTION = "x11/base"
include libx11_${PV}.bb
-PROVIDES += "libx11"
-
EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
index 481ce7d2cd..4ae26c4a14 100644
--- a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxext xextproto applewmproto"
+DEPENDS += " virtual/x11 libxext xextproto applewmproto"
XORG_PN = "libAppleWM"
diff --git a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
index 8f0ed5f8ae..8e14c07680 100644
--- a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
@@ -2,4 +2,4 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxext xextproto dmxproto"
+DEPENDS += " virtual/x11 libxext xextproto dmxproto"
diff --git a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
index 8f0ed5f8ae..8e14c07680 100644
--- a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
@@ -2,4 +2,4 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxext xextproto dmxproto"
+DEPENDS += " virtual/x11 libxext xextproto dmxproto"
diff --git a/packages/xorg-lib/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb
index 1311145334..c5403f625f 100644
--- a/packages/xorg-lib/libice_6.3.3.bb
+++ b/packages/xorg-lib/libice_6.3.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
LICENSE= "MIT"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
PROVIDES = "ice"
DESCRIPTION = "X11 ICE library"
PR = "r1"
diff --git a/packages/xorg-lib/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb
index 90c98d594a..598791cc40 100644
--- a/packages/xorg-lib/libice_cvs.bb
+++ b/packages/xorg-lib/libice_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE= "MIT"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
PROVIDES = "ice"
DESCRIPTION = "X11 ICE library"
PR = "r1"
diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
index 1dbf2fe068..3d17aa561b 100644
--- a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11"
+DEPENDS += " virtual/x11"
XORG_PN = "liboldX"
diff --git a/packages/xorg-lib/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb
index 08f9597045..51dbe93251 100644
--- a/packages/xorg-lib/libsm_6.0.3.bb
+++ b/packages/xorg-lib/libsm_6.0.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
LICENSE = "MIT-X"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libice"
+DEPENDS = "virtual/x11 libice"
DESCRIPTION = "Session management library"
PR = "r1"
diff --git a/packages/xorg-lib/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb
index 22b316cf57..ce43901aad 100644
--- a/packages/xorg-lib/libsm_cvs.bb
+++ b/packages/xorg-lib/libsm_cvs.bb
@@ -2,7 +2,7 @@ PV = "6.0.3+cvs${SRCDATE}"
LICENSE = "MIT-X"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "libx11 libice"
+DEPENDS = "virtual/x11 libice"
DESCRIPTION = "Session management library"
PR = "r1"
diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
index 1848a14fd2..27cf01a31c 100644
--- a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxext xextproto windowswmproto"
+DEPENDS += " virtual/x11 libxext xextproto windowswmproto"
XORG_PN = "libWindowsWM"
diff --git a/packages/xorg-lib/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb
index 901746bafa..54e79bf727 100644
--- a/packages/xorg-lib/libx11_6.2.1.bb
+++ b/packages/xorg-lib/libx11_6.2.1.bb
@@ -3,7 +3,7 @@ LICENSE = "XFree86"
PRIORITY = "optional"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "x11"
+PROVIDES = "virtual/x11"
DESCRIPTION = "Base X libs."
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
index de33be0bf8..e738d48e73 100644
--- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Base X libs."
DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "x11"
+PROVIDES = "virtual/x11"
XORG_PN = "libX11"
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index de33be0bf8..e738d48e73 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Base X libs."
DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "x11"
+PROVIDES = "virtual/x11"
XORG_PN = "libX11"
diff --git a/packages/xorg-lib/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb
index d44dd76aac..b37d0e13e7 100644
--- a/packages/xorg-lib/libx11_cvs.bb
+++ b/packages/xorg-lib/libx11_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "x11/libs"
PRIORITY = "optional"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "x11"
+PROVIDES = "virtual/x11"
DESCRIPTION = "Base X libs."
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index ed6623f03a..347d4c1386 100644
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
LICENSE = "XFree86"
DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
-PROVIDES = "x11"
+PROVIDES = "virtual/x11"
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/packages/xorg-lib/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb
index 929b54a127..883886efb2 100644
--- a/packages/xorg-lib/libxaw_7.0.2.bb
+++ b/packages/xorg-lib/libxaw_7.0.2.bb
@@ -2,7 +2,7 @@ SECTION = "x11/libs"
LICENSE = "MIT"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "xproto libx11 libxt libxmu libxpm"
+DEPENDS = "xproto virtual/x11 libxt libxmu libxpm"
PROVIDES = "xaw"
DESCRIPTION = "X Athena Widgets library"
diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
index b1b1ad48be..a558b889ae 100644
--- a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xaw is the X Athena Widget Set."
-DEPENDS += " xproto libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+DEPENDS += " xproto virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
PROVIDES = "xaw"
XORG_PN = "libXaw"
diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
index b1b1ad48be..a558b889ae 100644
--- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xaw is the X Athena Widget Set."
-DEPENDS += " xproto libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+DEPENDS += " xproto virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
PROVIDES = "xaw"
XORG_PN = "libXaw"
diff --git a/packages/xorg-lib/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb
index 7860f6e6b1..da21df75c3 100644
--- a/packages/xorg-lib/libxaw_cvs.bb
+++ b/packages/xorg-lib/libxaw_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "xproto libx11 libxt libxmu libxpm"
+DEPENDS = "xproto virtual/x11 libxt libxmu libxpm"
PROVIDES = "xaw"
DESCRIPTION = "X Athena Widgets library"
diff --git a/packages/xorg-lib/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb
index e2ca3bbc7b..987a7043b5 100644
--- a/packages/xorg-lib/libxcomposite_1.0.1.bb
+++ b/packages/xorg-lib/libxcomposite_1.0.1.bb
@@ -1,6 +1,6 @@
SECTION = "x11/libs"
LICENSE= "BSD-X"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
+DEPENDS = "virtual/x11 compositeext xextensions libxfixes"
PROVIDES = "xcomposite"
DESCRIPTION = "X Composite extension library."
PR = "r1"
diff --git a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
index 806cc69082..ee5b2f7358 100644
--- a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Composite extension library."
LICENSE= "BSD-X"
-DEPENDS += " compositeproto libx11 libxfixes"
+DEPENDS += " compositeproto virtual/x11 libxfixes"
PROVIDES = "xcomposite"
XORG_PN = "libXcomposite"
diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
index 806cc69082..ee5b2f7358 100644
--- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
+++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Composite extension library."
LICENSE= "BSD-X"
-DEPENDS += " compositeproto libx11 libxfixes"
+DEPENDS += " compositeproto virtual/x11 libxfixes"
PROVIDES = "xcomposite"
XORG_PN = "libXcomposite"
diff --git a/packages/xorg-lib/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb
index 1d8b69c8c6..922488593a 100644
--- a/packages/xorg-lib/libxcomposite_cvs.bb
+++ b/packages/xorg-lib/libxcomposite_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE= "BSD-X"
SECTION = "x11/libs"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
+DEPENDS = "virtual/x11 compositeext xextensions libxfixes"
PROVIDES = "xcomposite"
DESCRIPTION = "X Composite extension library."
diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
index 7b9aa035c6..25f1c15d78 100644
--- a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
+++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Cursor library"
LICENSE= "BSD-X"
-DEPENDS += " libxrender libxfixes libx11 fixesproto"
+DEPENDS += " libxrender libxfixes virtual/x11 fixesproto"
XORG_PN = "libXcursor"
diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
index 7b9aa035c6..25f1c15d78 100644
--- a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
+++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Cursor library"
LICENSE= "BSD-X"
-DEPENDS += " libxrender libxfixes libx11 fixesproto"
+DEPENDS += " libxrender libxfixes virtual/x11 fixesproto"
XORG_PN = "libXcursor"
diff --git a/packages/xorg-lib/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb
index 040e863447..c2e9ab0ae0 100644
--- a/packages/xorg-lib/libxdamage_1.0.1.bb
+++ b/packages/xorg-lib/libxdamage_1.0.1.bb
@@ -1,6 +1,6 @@
SECTION = "x11/libs"
LICENSE= "BSD-X"
-DEPENDS = "libx11 damageext libxfixes xproto"
+DEPENDS = "virtual/x11 damageext libxfixes xproto"
PROVIDES = "xdamage"
DESCRIPTION = "X Damage extension library."
PR = "r1"
diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
index 190a01e2f6..258ec25203 100644
--- a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
+++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Damage extension library."
LICENSE= "BSD-X"
-DEPENDS += " libx11 damageproto libxfixes fixesproto xextproto"
+DEPENDS += " virtual/x11 damageproto libxfixes fixesproto xextproto"
PROVIDES = "xdamage"
XORG_PN = "libXdamage"
diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
index 190a01e2f6..258ec25203 100644
--- a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
+++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Damage extension library."
LICENSE= "BSD-X"
-DEPENDS += " libx11 damageproto libxfixes fixesproto xextproto"
+DEPENDS += " virtual/x11 damageproto libxfixes fixesproto xextproto"
PROVIDES = "xdamage"
XORG_PN = "libXdamage"
diff --git a/packages/xorg-lib/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb
index ba8a68033a..41f7846888 100644
--- a/packages/xorg-lib/libxdamage_cvs.bb
+++ b/packages/xorg-lib/libxdamage_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE= "BSD-X"
SECTION = "x11/libs"
-DEPENDS = "libx11 damageext libxfixes xproto"
+DEPENDS = "virtual/x11 damageext libxfixes xproto"
PROVIDES = "xdamage"
DESCRIPTION = "X Damage extension library."
diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
index da09dc69c0..1697278938 100644
--- a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " xproto libx11 xextproto libxext evieext"
+DEPENDS += " xproto virtual/x11 xextproto libxext evieext"
XORG_PN = "libXevie"
diff --git a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
index da09dc69c0..1697278938 100644
--- a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " xproto libx11 xextproto libxext evieext"
+DEPENDS += " xproto virtual/x11 xextproto libxext evieext"
XORG_PN = "libXevie"
diff --git a/packages/xorg-lib/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb
index 9294b080b7..27f7c1c96e 100644
--- a/packages/xorg-lib/libxext-native_cvs.bb
+++ b/packages/xorg-lib/libxext-native_cvs.bb
@@ -2,5 +2,5 @@ SECTION = "unknown"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
include libxext_${PV}.bb
inherit native
-DEPENDS = "libx11-native xextensions-native"
+DEPENDS = "virtual/x11-native xextensions-native"
PROVIDES = ""
diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
index ca32e52d31..d16fc00f5b 100644
--- a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Server Extension library"
PRIORITY = "optional"
-DEPENDS += " xproto libx11 xextproto libxau"
+DEPENDS += " xproto virtual/x11 xextproto libxau"
PROVIDES = "xext"
XORG_PN = "libXext"
diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
index ca32e52d31..d16fc00f5b 100644
--- a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Server Extension library"
PRIORITY = "optional"
-DEPENDS += " xproto libx11 xextproto libxau"
+DEPENDS += " xproto virtual/x11 xextproto libxau"
PROVIDES = "xext"
XORG_PN = "libXext"
diff --git a/packages/xorg-lib/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb
index 0ef675ca70..3193857eb8 100644
--- a/packages/xorg-lib/libxext_cvs.bb
+++ b/packages/xorg-lib/libxext_cvs.bb
@@ -4,7 +4,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Extension library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "xproto libx11 xextensions"
+DEPENDS = "xproto virtual/x11 xextensions"
PROVIDES = "xext"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
diff --git a/packages/xorg-lib/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb
index 710fa17454..2c86445d74 100644
--- a/packages/xorg-lib/libxfixes_2.0.1.bb
+++ b/packages/xorg-lib/libxfixes_2.0.1.bb
@@ -1,6 +1,6 @@
SECTION = "x11/libs"
LICENSE= "BSD-X"
-DEPENDS = "libx11 fixesext"
+DEPENDS = "virtual/x11 fixesext"
DESCRIPTION = "X Fixes extension library."
PR = "r1"
diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
index 04b2e48006..f39b08b3ae 100644
--- a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
+++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Fixes extension library."
LICENSE= "BSD-X"
-DEPENDS += " libx11 xproto fixesproto xextproto"
+DEPENDS += " virtual/x11 xproto fixesproto xextproto"
XORG_PN = "libXfixes"
diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
index 04b2e48006..f39b08b3ae 100644
--- a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
+++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Fixes extension library."
LICENSE= "BSD-X"
-DEPENDS += " libx11 xproto fixesproto xextproto"
+DEPENDS += " virtual/x11 xproto fixesproto xextproto"
XORG_PN = "libXfixes"
diff --git a/packages/xorg-lib/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb
index 4494dc9326..50d01a1f21 100644
--- a/packages/xorg-lib/libxfixes_cvs.bb
+++ b/packages/xorg-lib/libxfixes_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE= "BSD-X"
SECTION = "x11/libs"
-DEPENDS = "libx11 fixesext"
+DEPENDS = "virtual/x11 fixesext"
DESCRIPTION = "X Fixes extension library."
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
index 5de5a2a590..b4cf34f438 100644
--- a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxext xextproto fontcacheproto"
+DEPENDS += " virtual/x11 libxext xextproto fontcacheproto"
XORG_PN = "libXfontcache"
diff --git a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
index 5de5a2a590..b4cf34f438 100644
--- a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxext xextproto fontcacheproto"
+DEPENDS += " virtual/x11 libxext xextproto fontcacheproto"
XORG_PN = "libXfontcache"
diff --git a/packages/xorg-lib/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb
index c3f1f74e40..03abf5a6ab 100644
--- a/packages/xorg-lib/libxft_2.1.6.bb
+++ b/packages/xorg-lib/libxft_2.1.6.bb
@@ -1,6 +1,6 @@
SECTION = "x11/libs"
LICENSE = "MIT-X"
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+DEPENDS = "virtual/x11 xproto libxrender freetype fontconfig"
DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
PROVIDES = "xft"
PR = "r1"
diff --git a/packages/xorg-lib/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb
index 6c1a5f5c32..e1cc3ceb7b 100644
--- a/packages/xorg-lib/libxft_cvs.bb
+++ b/packages/xorg-lib/libxft_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT-X"
SECTION = "x11/libs"
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+DEPENDS = "virtual/x11 xproto libxrender freetype fontconfig"
DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
PROVIDES = "xft"
diff --git a/packages/xorg-lib/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb
index 5c44d06df3..8900afdc6f 100644
--- a/packages/xorg-lib/libxi_6.0.1.bb
+++ b/packages/xorg-lib/libxi_6.0.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "X Input Extension library"
LICENSE = "MIT-X"
SECTION = "x11/libs"
-DEPENDS = "xproto libx11 xextensions"
+DEPENDS = "xproto virtual/x11 xextensions"
PR = "r1"
SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
index 10ea847e9c..8ba01c923b 100644
--- a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Input extension library."
-DEPENDS += " xproto libx11 xextproto libxext inputproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext inputproto"
XORG_PN = "libXi"
diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
index 10ea847e9c..8ba01c923b 100644
--- a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Input extension library."
-DEPENDS += " xproto libx11 xextproto libxext inputproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext inputproto"
XORG_PN = "libXi"
diff --git a/packages/xorg-lib/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb
index 767c641a95..191e90a2ec 100644
--- a/packages/xorg-lib/libxi_cvs.bb
+++ b/packages/xorg-lib/libxi_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT-X"
SECTION = "x11/libs"
-DEPENDS = "xproto libx11 xextensions"
+DEPENDS = "xproto virtual/x11 xextensions"
DESCRIPTION = "X Input extension library."
PR = "r1"
diff --git a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
index dc5d82b9b0..d2d4e31027 100644
--- a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
SECTION = "x11/libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext xproto libx11 libxext"
+DEPENDS = "panoramixext xproto virtual/x11 libxext"
PROVIDES = "xinerama"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
index a267e6c2d9..4036f17fd8 100644
--- a/packages/xorg-lib/libxinerama_1.0.2.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xinerama library"
SECTION = "x11/libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext xproto libx11 libxext"
+DEPENDS = "panoramixext xproto virtual/x11 libxext"
PROVIDES = "xinerama"
PR = "r1"
diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
index 88ce13b30e..4904bfd840 100644
--- a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xinerama library"
PRIORITY = "optional"
-DEPENDS += " libx11 libxext xextproto xineramaproto"
+DEPENDS += " virtual/x11 libxext xextproto xineramaproto"
PROVIDES = "xinerama"
XORG_PN = "libXinerama"
diff --git a/packages/xorg-lib/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb
index 3e959df19e..10604909f6 100644
--- a/packages/xorg-lib/libxinerama_cvs.bb
+++ b/packages/xorg-lib/libxinerama_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Xinerama library"
LICENSE = "MIT"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "panoramixext xproto libx11 libxext"
+DEPENDS = "panoramixext xproto virtual/x11 libxext"
PROVIDES = "xinerama"
PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
index 58b085294e..eb73c0f4c4 100644
--- a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X11 keyboard library"
LICENSE= "GPL"
PRIORITY = "optional"
-DEPENDS += " libx11 kbproto"
+DEPENDS += " virtual/x11 kbproto"
diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
index 58b085294e..eb73c0f4c4 100644
--- a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
+++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X11 keyboard library"
LICENSE= "GPL"
PRIORITY = "optional"
-DEPENDS += " libx11 kbproto"
+DEPENDS += " virtual/x11 kbproto"
diff --git a/packages/xorg-lib/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb
index 1b433ef65f..de63e64057 100644
--- a/packages/xorg-lib/libxkbfile_cvs.bb
+++ b/packages/xorg-lib/libxkbfile_cvs.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
PV = "0.0+cvs${SRCDATE}"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "libx11"
+DEPENDS = "virtual/x11"
DESCRIPTION = "X11 keyboard library"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
index 3039ff09b4..af76b740a3 100644
--- a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X11 lbxkbui library"
LICENSE= "GPL"
PRIORITY = "optional"
-DEPENDS += " libx11 libxt libxkbfile"
+DEPENDS += " virtual/x11 libxt libxkbfile"
PROVIDES = "xkbui"
diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
index 3039ff09b4..af76b740a3 100644
--- a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X11 lbxkbui library"
LICENSE= "GPL"
PRIORITY = "optional"
-DEPENDS += " libx11 libxt libxkbfile"
+DEPENDS += " virtual/x11 libxt libxkbfile"
PROVIDES = "xkbui"
diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
index ed2e765084..7f3d946dff 100644
--- a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Window System miscellaneous utility library"
PRIORITY = "optional"
-DEPENDS += " libxt libxext xextproto libx11"
+DEPENDS += " libxt libxext xextproto virtual/x11"
PROVIDES = "xmu"
XORG_PN = "libXmu"
diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
index ed2e765084..7f3d946dff 100644
--- a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Window System miscellaneous utility library"
PRIORITY = "optional"
-DEPENDS += " libxt libxext xextproto libx11"
+DEPENDS += " libxt libxext xextproto virtual/x11"
PROVIDES = "xmu"
XORG_PN = "libXmu"
diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
index fc77aa08c8..5565f35010 100644
--- a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X print extension library."
-DEPENDS += " libx11 libxext xextproto libxau printproto"
+DEPENDS += " virtual/x11 libxext xextproto libxau printproto"
XORG_PN = "libXp"
diff --git a/packages/xorg-lib/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb
index eaf6546d0e..0d31fd6bca 100644
--- a/packages/xorg-lib/libxp_cvs.bb
+++ b/packages/xorg-lib/libxp_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
PV = "0.0+cvs${SRCDATE}"
SECTION = "libs"
-DEPENDS = "libx11 libxext"
+DEPENDS = "virtual/x11 libxext"
DESCRIPTION = "X print extension library."
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
diff --git a/packages/xorg-lib/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb
index 513261efd3..69a2d5953a 100644
--- a/packages/xorg-lib/libxpm_3.5.1.bb
+++ b/packages/xorg-lib/libxpm_3.5.1.bb
@@ -2,7 +2,7 @@ SECTION = "x11/libs"
LICENSE = "X-BSD"
PRIORITY = "optional"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto libx11"
+DEPENDS = "xproto virtual/x11"
PROVIDES = "xpm"
DESCRIPTION = "X Pixmap library."
PR = "r1"
diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
index 94e638ce74..b99596f5f1 100644
--- a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
+++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Pixmap library."
PRIORITY = "optional"
LICENSE = "X-BSD"
-DEPENDS += " xproto libx11 libxt libxext xextproto"
+DEPENDS += " xproto virtual/x11 libxt libxext xextproto"
XORG_PN = "libXpm"
diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
index 94e638ce74..b99596f5f1 100644
--- a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
+++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Pixmap library."
PRIORITY = "optional"
LICENSE = "X-BSD"
-DEPENDS += " xproto libx11 libxt libxext xextproto"
+DEPENDS += " xproto virtual/x11 libxt libxext xextproto"
XORG_PN = "libXpm"
diff --git a/packages/xorg-lib/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb
index 1b46855735..3e625a1dd4 100644
--- a/packages/xorg-lib/libxpm_cvs.bb
+++ b/packages/xorg-lib/libxpm_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "X-BSD"
SECTION = "x11/libs"
PRIORITY = "optional"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto libx11"
+DEPENDS = "xproto virtual/x11"
PROVIDES = "xpm"
DESCRIPTION = "X Pixmap library."
PR = "r1"
diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
index d65caf0eae..a8fcd93f69 100644
--- a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxp libxprintutil printproto libxau"
+DEPENDS += " virtual/x11 libxp libxprintutil printproto libxau"
XORG_PN = "libXprintAppUtil"
diff --git a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
index dfb38c6624..c0d1244a26 100644
--- a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxp libxt printproto libxau"
+DEPENDS += " virtual/x11 libxp libxt printproto libxau"
XORG_PN = "libXprintUtil"
diff --git a/packages/xorg-lib/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb
index efd0505544..ddb1f61556 100644
--- a/packages/xorg-lib/libxrandr_1.0.2.bb
+++ b/packages/xorg-lib/libxrandr_1.0.2.bb
@@ -1,6 +1,6 @@
SECTION = "x11/libs"
LICENSE = "BSD-X"
-DEPENDS = "randrext libx11 libxrender libxext"
+DEPENDS = "randrext virtual/x11 libxrender libxext"
DESCRIPTION = "X Resize and Rotate extension library."
PR = "r1"
diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
index d14bc4c8bb..42062b5902 100644
--- a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
+++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Resize and Rotate extension library."
LICENSE = "BSD-X"
-DEPENDS += " libx11 randrproto libxext xextproto libxrender renderproto"
+DEPENDS += " virtual/x11 randrproto libxext xextproto libxrender renderproto"
XORG_PN = "libXrandr"
diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
index d14bc4c8bb..42062b5902 100644
--- a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
+++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Resize and Rotate extension library."
LICENSE = "BSD-X"
-DEPENDS += " libx11 randrproto libxext xextproto libxrender renderproto"
+DEPENDS += " virtual/x11 randrproto libxext xextproto libxrender renderproto"
XORG_PN = "libXrandr"
diff --git a/packages/xorg-lib/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb
index 3b6fd02de8..44b34f07d3 100644
--- a/packages/xorg-lib/libxrandr_cvs.bb
+++ b/packages/xorg-lib/libxrandr_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "BSD-X"
SECTION = "x11/libs"
-DEPENDS = "randrext libx11 libxrender libxext"
+DEPENDS = "randrext virtual/x11 libxrender libxext"
DESCRIPTION = "X Resize and Rotate extension library."
PR = "r1"
diff --git a/packages/xorg-lib/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb
index b36c5701ba..129cc58bbb 100644
--- a/packages/xorg-lib/libxrender_0.8.4.bb
+++ b/packages/xorg-lib/libxrender_0.8.4.bb
@@ -1,5 +1,5 @@
SECTION = "libs"
-DEPENDS = "renderext libx11"
+DEPENDS = "renderext virtual/x11"
DESCRIPTION = "X Render extension library."
LICENSE = "BSD"
PR = "r1"
diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
index 797780042c..6f6fe2a7f9 100644
--- a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
+++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Render extension library."
LICENSE = "BSD-X"
-DEPENDS += " libx11 renderproto"
+DEPENDS += " virtual/x11 renderproto"
XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
index 797780042c..6f6fe2a7f9 100644
--- a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
+++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Render extension library."
LICENSE = "BSD-X"
-DEPENDS += " libx11 renderproto"
+DEPENDS += " virtual/x11 renderproto"
XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb
index ea6b1f4607..49a3f4204a 100644
--- a/packages/xorg-lib/libxrender_cvs.bb
+++ b/packages/xorg-lib/libxrender_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
PR = "r1"
SECTION = "libs"
-DEPENDS = "renderext libx11"
+DEPENDS = "renderext virtual/x11"
DESCRIPTION = "X Render extension library."
LICENSE = "BSD"
diff --git a/packages/xorg-lib/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb
index c01731d37a..752ef865fd 100644
--- a/packages/xorg-lib/libxres_1.0.1.bb
+++ b/packages/xorg-lib/libxres_1.0.1.bb
@@ -1,6 +1,6 @@
SECTION = "x11/libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "libx11 xextensions libxext resourceext"
+DEPENDS = "virtual/x11 xextensions libxext resourceext"
PROVIDES = "xres"
DESCRIPTION = "X Resource usage library."
LICENSE = "X-MIT"
diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
index 4e7b203584..ed49e72be6 100644
--- a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Resource usage library."
-DEPENDS += " libx11 libxext xextproto resourceproto"
+DEPENDS += " virtual/x11 libxext xextproto resourceproto"
XORG_PN = "libXres"
diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
index 4e7b203584..ed49e72be6 100644
--- a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Resource usage library."
-DEPENDS += " libx11 libxext xextproto resourceproto"
+DEPENDS += " virtual/x11 libxext xextproto resourceproto"
XORG_PN = "libXres"
diff --git a/packages/xorg-lib/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb
index e3e5c6704c..0c19870e16 100644
--- a/packages/xorg-lib/libxres_cvs.bb
+++ b/packages/xorg-lib/libxres_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
SECTION = "x11/libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "libx11 xextensions libxext resourceext"
+DEPENDS = "virtual/x11 xextensions libxext resourceext"
PROVIDES = "xres"
DESCRIPTION = "X Resource usage library."
LICENSE = "X-MIT"
diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
index fc77bdf373..c41dbe5a12 100644
--- a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X screen saver extension library."
LICENSE = "GPL"
-DEPENDS += " libx11 libxext xextproto scrnsaverproto"
+DEPENDS += " virtual/x11 libxext xextproto scrnsaverproto"
XORG_PN = "libXScrnSaver"
diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
index fc77bdf373..c41dbe5a12 100644
--- a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
+++ b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X screen saver extension library."
LICENSE = "GPL"
-DEPENDS += " libx11 libxext xextproto scrnsaverproto"
+DEPENDS += " virtual/x11 libxext xextproto scrnsaverproto"
XORG_PN = "libXScrnSaver"
diff --git a/packages/xorg-lib/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb
index af064f5b4d..36d3d5956b 100644
--- a/packages/xorg-lib/libxss_cvs.bb
+++ b/packages/xorg-lib/libxss_cvs.bb
@@ -4,7 +4,7 @@ PV = "0.0+cvs${SRCDATE}"
PR = "r2"
SECTION = "libs"
-DEPENDS = "libx11 libxext"
+DEPENDS = "virtual/x11 libxext"
DESCRIPTION = "X screen saver extension library."
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
diff --git a/packages/xorg-lib/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb
index 00cbe9a3ad..4d8139b850 100644
--- a/packages/xorg-lib/libxt_0.1.5.bb
+++ b/packages/xorg-lib/libxt_0.1.5.bb
@@ -1,7 +1,7 @@
SECTION = "x11/libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libsm"
+DEPENDS = "virtual/x11 libsm"
PROVIDES = "xt"
DESCRIPTION = "X Toolkit Intrinsics"
LICENSE = "X-MIT"
diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
index 605827bc25..7c7054270a 100644
--- a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Toolkit Intrinsics"
PRIORITY = "optional"
-DEPENDS += " libsm libx11 xproto kbproto"
+DEPENDS += " libsm virtual/x11 xproto kbproto"
PROVIDES = "xt"
XORG_PN = "libXt"
diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
index 605827bc25..7c7054270a 100644
--- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Toolkit Intrinsics"
PRIORITY = "optional"
-DEPENDS += " libsm libx11 xproto kbproto"
+DEPENDS += " libsm virtual/x11 xproto kbproto"
PROVIDES = "xt"
XORG_PN = "libXt"
diff --git a/packages/xorg-lib/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb
index fdabe1d90f..6f8a66d0bd 100644
--- a/packages/xorg-lib/libxt_cvs.bb
+++ b/packages/xorg-lib/libxt_cvs.bb
@@ -1,7 +1,7 @@
PV = "0.0+cvs${SRCDATE}"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "libx11 libsm"
+DEPENDS = "virtual/x11 libsm"
PROVIDES = "xt"
DESCRIPTION = "X Toolkit Intrinsics"
LICENSE = "X-MIT"
diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
index c8999efd81..7f59ec2621 100644
--- a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " libx11 libxt trapproto libxext xextproto"
+DEPENDS += " virtual/x11 libxt trapproto libxext xextproto"
XORG_PN = "libXTrap"
diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
index a89203f5df..01bcada964 100644
--- a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Test Extension: client side library"
PRIORITY = "optional"
-DEPENDS += " libx11 libxext recordproto xextproto inputproto"
+DEPENDS += " virtual/x11 libxext recordproto xextproto inputproto"
PROVIDES = "xtst"
XORG_PN = "libXtst"
diff --git a/packages/xorg-lib/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb
index c7c24d5d74..875cd0914b 100644
--- a/packages/xorg-lib/libxtst_cvs.bb
+++ b/packages/xorg-lib/libxtst_cvs.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
PV = "0.0+cvs${SRCDATE}"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "libx11 recordext libxext"
+DEPENDS = "virtual/x11 recordext libxext"
PROVIDES = "xtst"
DESCRIPTION = "X Test Extension: client side library"
PR = "r3"
diff --git a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
index e70ce9cee9..e8f01379fd 100644
--- a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
+++ b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext"
+DEPENDS = "virtual/x11 libxext"
DESCRIPTION = "X Video extension library."
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
diff --git a/packages/xorg-lib/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb
index 49e9670120..e88a35f1cd 100644
--- a/packages/xorg-lib/libxv_2.2.2.bb
+++ b/packages/xorg-lib/libxv_2.2.2.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext"
+DEPENDS = "virtual/x11 libxext"
DESCRIPTION = "X Video extension library."
SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
index 0f7d074098..be3cacf4df 100644
--- a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Video extension library."
LICENSE = "GPL"
-DEPENDS += " libx11 libxext xextproto videoproto"
+DEPENDS += " virtual/x11 libxext xextproto videoproto"
XORG_PN = "libXv"
diff --git a/packages/xorg-lib/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb
index b70c9f52e4..6fa8c8a272 100644
--- a/packages/xorg-lib/libxvmc_20040919.bb
+++ b/packages/xorg-lib/libxvmc_20040919.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "X Video Motion Compensation extension library."
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext libxv drm xserver-xorg"
+DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg"
PR = "r2"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
diff --git a/packages/xorg-lib/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb
index 829a74d92b..55cbc58265 100644
--- a/packages/xorg-lib/libxvmc_20041025.bb
+++ b/packages/xorg-lib/libxvmc_20041025.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "X Video Motion Compensation extension library."
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext libxv drm xserver-xorg"
+DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg"
PR = "r2"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
diff --git a/packages/xorg-lib/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb
index 18cd369acc..d322ecfb33 100644
--- a/packages/xorg-lib/libxvmc_20050612.bb
+++ b/packages/xorg-lib/libxvmc_20050612.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "X Video Motion Compensation extension library."
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext libxv drm xserver-xorg"
+DEPENDS = "virtual/x11 libxext libxv drm xserver-xorg"
PR = "r0"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
index 3625d38bb8..aef95aaf60 100644
--- a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Video Motion Compensation extension library."
-DEPENDS += " libx11 libxext libxv xextproto videoproto"
+DEPENDS += " virtual/x11 libxext libxv xextproto videoproto"
XORG_PN = "libXvMC"
diff --git a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
index 3625d38bb8..aef95aaf60 100644
--- a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "X Video Motion Compensation extension library."
-DEPENDS += " libx11 libxext libxv xextproto videoproto"
+DEPENDS += " virtual/x11 libxext libxv xextproto videoproto"
XORG_PN = "libXvMC"
diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
index 57b686a8b5..30e979cf7d 100644
--- a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xxf86dga extension library."
-DEPENDS += " xproto libx11 xextproto libxext xf86dgaproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext xf86dgaproto"
XORG_PN = "libXxf86dga"
diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
index 57b686a8b5..30e979cf7d 100644
--- a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xxf86dga extension library."
-DEPENDS += " xproto libx11 xextproto libxext xf86dgaproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext xf86dgaproto"
XORG_PN = "libXxf86dga"
diff --git a/packages/xorg-lib/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb
index 96acce5d0e..cb91e2eb2d 100644
--- a/packages/xorg-lib/libxxf86dga_cvs.bb
+++ b/packages/xorg-lib/libxxf86dga_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "XFree86"
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext xxf86dgaext"
+DEPENDS = "virtual/x11 libxext xxf86dgaext"
DESCRIPTION = "Xxf86dga extension library."
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
index 50bddbe2b8..c6a95ddfd0 100644
--- a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " xproto libx11 xextproto libxext xf86miscproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext xf86miscproto"
PROVIDES = "xxf86misc"
XORG_PN = "libXxf86misc"
diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
index 50bddbe2b8..c6a95ddfd0 100644
--- a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
#DESCRIPTION = ""
-DEPENDS += " xproto libx11 xextproto libxext xf86miscproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext xf86miscproto"
PROVIDES = "xxf86misc"
XORG_PN = "libXxf86misc"
diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
index 8dac3c7417..c6b0ed5bfb 100644
--- a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xxf86vm extension library."
-DEPENDS += " xproto libx11 xextproto libxext xf86vidmodeproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext xf86vidmodeproto"
XORG_PN = "libXxf86vm"
diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
index 8dac3c7417..c6b0ed5bfb 100644
--- a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
@@ -2,7 +2,7 @@ include xorg-lib-common.inc
DESCRIPTION = "Xxf86vm extension library."
-DEPENDS += " xproto libx11 xextproto libxext xf86vidmodeproto"
+DEPENDS += " xproto virtual/x11 xextproto libxext xf86vidmodeproto"
XORG_PN = "libXxf86vm"
diff --git a/packages/xorg-lib/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb
index 5eb48f930d..a045adf458 100644
--- a/packages/xorg-lib/libxxf86vm_cvs.bb
+++ b/packages/xorg-lib/libxxf86vm_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
SECTION = "x11/libs"
-DEPENDS = "libx11 libxext xxf86vmext"
+DEPENDS = "virtual/x11 libxext xxf86vmext"
DESCRIPTION = "Xxf86vm extension library."
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
index 31bcb0c273..3683562543 100644
--- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
@@ -1,5 +1,5 @@
LICENSE = "MIT"
-DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/x11 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/packages/xorg-xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb
index 21529a69d9..8cbde48ebd 100644
--- a/packages/xorg-xserver/xserver-kdrive_20050207.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20050207.bb
@@ -3,11 +3,11 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
DEFAULT_PREFERENCE = "1"
LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
# Uncomment the following DEPENDS line and the commented line in SRC_URI
# to make this snapshot build against X11R7.0 xlibs.
-#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
+#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
diff --git a/packages/xorg-xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb
index c2e44f7837..fb6229e51f 100644
--- a/packages/xorg-xserver/xserver-kdrive_20050624.bb
+++ b/packages/xorg-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 libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/x11 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/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb
index e5101a3579..44a91ae1e9 100644
--- a/packages/xorg-xserver/xserver-kdrive_20060312.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb
@@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
DEFAULT_PREFERENCE = "1"
LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
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/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index 103185289c..2a572bea53 100644
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -1,5 +1,5 @@
LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
diff --git a/packages/xorg-xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb
index 1c841cabf7..c6d4a17e20 100644
--- a/packages/xorg-xserver/xserver-kdrive_cvs.bb
+++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
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/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 1f42cc159c..71522c2909 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -2,7 +2,7 @@ PV = "0.0+git"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index b2d8653f74..c26836893d 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/"
PR = "r1"
SECTION="x11-misc"
-DEPENDS="intltool libx11 gtk+ libxml2 libglade"
+DEPENDS = "intltool virtual/x11 gtk+ libxml2 libglade"
# xscreensaver-demo is a glade app
LDFLAGS_append = " -Wl,--export-dynamic"
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
index 75b6b43ef6..a7e457935c 100644
--- a/packages/xscreensaver/xscreensaver_4.22.bb
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/"
PR = "r0"
SECTION="x11-misc"
-DEPENDS="intltool libx11 gtk+ libxml2 libglade"
+DEPENDS = "intltool virtual/x11 gtk+ libxml2 libglade"
# xscreensaver-demo is a glade app
LDFLAGS_append = " -Wl,--export-dynamic"
diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb
index aeff63555d..e33a4c8223 100644
--- a/packages/xstroke/xstroke_0.6.bb
+++ b/packages/xstroke/xstroke_0.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 xft libxtst libxpm"
+DEPENDS = "virtual/x11 xft libxtst libxpm"
PR = "r2"
SRC_URI = "http://www.oesources.org/source/xstroke-0.6.tar.gz \
diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb
index fbd8a8d4c9..d53aabe4bf 100644
--- a/packages/xtscal/xtscal_0.4.bb
+++ b/packages/xtscal/xtscal_0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "libx11 libxft libxrandr"
+DEPENDS = "virtual/x11 libxft libxrandr"
SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb
index ef415227ef..9642be132a 100644
--- a/packages/xtscal/xtscal_0.5.1.bb
+++ b/packages/xtscal/xtscal_0.5.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "libx11 libxft libxrandr xcalibrate"
+DEPENDS = "virtual/x11 libxft libxrandr xcalibrate"
PR = "r1"
diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb
index 757f7d1f21..cec5782236 100644
--- a/packages/xtscal/xtscal_0.5.bb
+++ b/packages/xtscal/xtscal_0.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "libx11 libxft libxrandr xcalibrate"
+DEPENDS = "virtual/x11 libxft libxrandr xcalibrate"
SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index 70666f1fbf..c8e7657ffb 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/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 = "libx11 libxft libxrandr xcalibrate"
+DEPENDS = "virtual/x11 libxft libxrandr xcalibrate"
PR = "r1"