summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-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/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.inc2
-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.bb2
-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/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/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
338 files changed, 342 insertions, 342 deletions
diff --git a/packages/bzflag/bzflag_1.10.6.20040515.bb b/packages/bzflag/bzflag_1.10.6.20040515.bb
index a3a24fae31..62d5394171 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 virtual/x11"
+DEPENDS = "adns ncurses virtual/libx11"
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 214fb07ca8..c819b2ef46 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 = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "virtual/libx11 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 214fb07ca8..c819b2ef46 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 = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "virtual/libx11 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 c34a429607..d414a35019 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 = "virtual/x11 libpng fontconfig libxrender"
+DEPENDS = "virtual/libx11 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 09e8fa81b6..9f8425c03f 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 = "virtual/x11 libpng fontconfig libxrender"
+DEPENDS = "virtual/libx11 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 101a3e418e..cef51d2212 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 = "virtual/x11 libpng fontconfig libxrender"
+DEPENDS = "virtual/libx11 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 c6ad012a24..700f425113 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 = "virtual/x11 libpng fontconfig libxrender"
+DEPENDS = "virtual/libx11 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 c6ad012a24..700f425113 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 = "virtual/x11 libpng fontconfig libxrender"
+DEPENDS = "virtual/libx11 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 45e277ef82..2498b585f9 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 = "virtual/x11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/x11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "virtual/libx11 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 75833b606e..00b7209fee 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 = "virtual/x11 xrdb xcursor-transparent-theme"
+DEPENDS = "virtual/libx11 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 729a15de74..2203363b7b 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 = "virtual/x11 xcursor-transparent-theme xrdb"
+DEPENDS = "virtual/libx11 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 b5318093a9..da163d31ad 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 virtual/x11 libxext freetype"
+DEPENDS += "edb virtual/libx11 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 38a9541fdf..a7dfc9d32d 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 += "virtual/x11 libxext"
+DEPENDS += "virtual/libx11 libxext"
PR = "r1"
EXTRA_OECONF = "--disable-mmx \
diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb
index ce0f510c85..37cbd49d2f 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 virtual/x11 libxext libxt"
+DEPENDS = "imlib2 giblib jpeg virtual/libx11 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 ce0f510c85..37cbd49d2f 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 virtual/x11 libxext libxt"
+DEPENDS = "imlib2 giblib jpeg virtual/libx11 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 c742177499..948dc579b3 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 = "virtual/x11 libpng gd readline"
+DEPENDS = "virtual/libx11 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 3cdd2b6b76..5f2ee4f122 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 virtual/x11"
+DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11"
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 1f6ef0f7cc..5e6fe34c10 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 virtual/x11"
+DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11"
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 5f62983faa..8bd4260184 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 = "virtual/x11 esound-gpe"
+DEPENDS = "virtual/libx11 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 d9d800e38b..7744a9d2c0 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 a82e6e26cb..6d902f6a2e 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 = "virtual/x11 libxpm libmatchbox"
+DEPENDS = "virtual/libx11 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 ed72a37b1e..dcaa848124 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 = "virtual/x11 libxpm libmatchbox"
+DEPENDS = "virtual/libx11 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 f8d824cae3..2cc0dc9c2f 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 = "virtual/x11 gtk+"
+DEPENDS = "virtual/libx11 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 f8d824cae3..2cc0dc9c2f 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 = "virtual/x11 gtk+"
+DEPENDS = "virtual/libx11 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 f8d824cae3..2cc0dc9c2f 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 = "virtual/x11 gtk+"
+DEPENDS = "virtual/libx11 gtk+"
GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb
index e21769f33a..bd83a42c53 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 = "virtual/x11 gtk+"
+DEPENDS = "virtual/libx11 gtk+"
diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb
index edd0bfdd10..1cd2c39289 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 = "virtual/x11 libxaw rpm2cpio-native"
+DEPENDS = "virtual/libx11 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 ee444faf06..76fa2abf79 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 = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
+DEPENDS = "virtual/libx11 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 60e3a9a867..1454ae00f0 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 = "virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
+DEPENDS = "virtual/libx11 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 919fa64e34..432da1b629 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 virtual/x11 libxext"
+DEPENDS += "lua-native lua virtual/libx11 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 5a246f4a08..7f1a54f4b1 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 virtual/x11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 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 4d531f49ce..184a042d61 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 virtual/x11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 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 3455571613..ba9eb14bc7 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 virtual/x11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 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 6ba72a50c3..20b59fb9c2 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 virtual/x11"
+DEPENDS = "alsa-lib freetype virtual/libx11"
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 1a33fac5af..71682b336a 100644
--- a/packages/libmatchbox/libmatchbox.inc
+++ b/packages/libmatchbox/libmatchbox.inc
@@ -1,7 +1,7 @@
SECTION = "x11/libs"
DESCRIPTION = "Matchbox window manager core library"
LICENSE = "GPL"
-DEPENDS = "virtual/x11 libxext expat libxft jpeg libpng zlib libxsettings-client"
+DEPENDS = "virtual/libx11 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 2725031201..5f433e4619 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 2725031201..5f433e4619 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 cd59c7b050..0ed6ff7dd9 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 a29a56adab..9d3e57543d 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 = "virtual/x11 libxext"
+DEPENDS = "virtual/libx11 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 986dba6da0..c9c8b90187 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 virtual/x11 libxext"
+DEPENDS = "alsa-lib virtual/libx11 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 073c977ddb..944710497f 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 virtual/x11"
+DEPENDS = "zlib jpeg virtual/libx11"
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 4f76bde334..dfce1d32ec 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 virtual/x11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 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 0012301a16..8f172f23a7 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 virtual/x11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 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 5b707c074f..8914c3d0c4 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 virtual/x11"
+DEPENDS = "libgpewidget libxsettings virtual/libx11"
inherit pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.13.bb b/packages/libxsettings-client/libxsettings-client_0.13.bb
index 14c9e6544e..97ebe9c7ab 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 virtual/x11"
+DEPENDS = "libgpewidget libxsettings virtual/libx11"
inherit pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
index f47b99f849..42a4a55e29 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 virtual/x11 libxt"
+DEPENDS = "libxsettings virtual/libx11 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 15786d5d87..7872a434b1 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 virtual/x11 libxt"
+DEPENDS = "libxsettings virtual/libx11 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 6c60c0499e..f25ca927ad 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 virtual/x11 libxt gtk-doc"
+DEPENDS = "libxsettings virtual/libx11 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 867bcb1355..d3197a89c2 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
inherit gpe
diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb
index b2c2e6d4f0..78580d6f1a 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 = "virtual/x11 libxext"
+DEPENDS = "virtual/libx11 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 6854248de2..4323b2e59a 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 virtual/x11"
+DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
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 6854248de2..4323b2e59a 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 virtual/x11"
+DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
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 43253937b2..5044c69c6e 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 virtual/x11 libxau libsm libice"
+DEPENDS = "virtual/kernel virtual/libx11 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 2ffa19b6bc..300e7804df 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>"
-DEPENDS = "virtual/x11 dbus libosso"
+DEPENDS = "virtual/libx11 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 b8ee5d9b98..d56581dcde 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 = "virtual/x11 xextensions libxext"
+DEPENDS = "virtual/libx11 xextensions libxext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
file://auxdir.patch;patch=1;pnum=0"
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index d797724f4c..7c54931b03 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 = "virtual/x11 xextensions libxext xpext"
+DEPENDS = "virtual/libx11 xextensions libxext xpext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
S = "${WORKDIR}/Xsp"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index 3f836a32bb..9475edd55e 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 virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/libx11 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 dd991ddbaa..f6bc0166fc 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 virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/libx11 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 361a901597..a65c017f9e 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 virtual/x11 libxext libxpm"
+DEPENDS = "libmatchbox virtual/libx11 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 fa68298a37..3a10e1938d 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 virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/libx11 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 9b36f17692..4f0a8a6b00 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 virtual/x11 libxext libxpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox virtual/libx11 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 af791cbe23..947f14e867 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 af791cbe23..947f14e867 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 7f8b768106..304efc3c44 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 b858153b8f..3a46009a4c 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 05f006c195..4fa9a6bd74 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 06cd29eb6b..aad37abc3f 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 ddc3dccd62..4a9fa639f2 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 88c04d9473..00bea89603 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 5720c23392..95d24b5b95 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 virtual/x11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 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 b3fccad992..c39dc02d97 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 virtual/x11 libxext libxxf86vm libxi libxmu libice"
+DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 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 f0e5e46d6e..980f928ccd 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 df8cfe7781..e67bf0daff 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 = "virtual/x11 libxext gtk+ libdictionary zlib"
+DEPENDS = "virtual/libx11 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 f4f34a672c..153d226f97 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 = "virtual/x11 libxext libxpm jpeg libpng"
+DEPENDS = "virtual/libx11 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 4be6047ffa..27d57052f7 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 virtual/x11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index 3006b41970..74730e18db 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 virtual/x11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index 8859f6b873..907d813d00 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 virtual/x11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.13.2.bb b/packages/pango/pango_1.13.2.bb
index dda2cf7d1c..fb2a6a7394 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 virtual/x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 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 bf66887e9f..5a8e3da345 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 virtual/x11 libxft libxt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 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 1e53f049d4..3f2f664d21 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 virtual/x11 libxft libxt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 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 52007acf78..32edd7965c 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 virtual/x11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb
index 55dac29f25..fe9752c8bd 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 virtual/x11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb
index 55dac29f25..fe9752c8bd 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 virtual/x11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index 7dad993d9c..923e17a029 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 virtual/x11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 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 d110d0a76d..dad91c7101 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 virtual/x11 libxft libxt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 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 6509bac524..b246e9ebcf 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 virtual/x11 xft libxext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 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 128413d166..cd0f90becd 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 virtual/x11 xft libxext libxrender libxrandr libxcursor"
+DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 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 7695b336d3..ed19483d6b 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 = "virtual/x11 openssl"
+DEPENDS = "virtual/libx11 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 5d0dff6627..315dd87ebe 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 = "virtual/x11 openssl"
+DEPENDS = "virtual/libx11 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 0568789afa..e111189e6f 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/x11 openssl"
+DEPENDS = "virtual/libx11 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 06f8d8c73c..726b68aa81 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 virtual/x11 libxrandr libxft libxtst libxext libxau \
+DEPENDS = "gtk+ libgpewidget virtual/libx11 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 5ba2b23616..3b96243b77 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_4.9.bb b/packages/rxvt-unicode/rxvt-unicode_4.9.bb
index dd3cf46c2c..d7c5b4c705 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.2.bb b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
index 001da697ad..966f006178 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
index 2825fb015f..b3f261818c 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.4.bb b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
index 2825fb015f..b3f261818c 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 296582ef73..f9ba2bedde 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb
index e6c3c165a3..532fe2da63 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 = "virtual/x11 libxt libxft libxpm"
+DEPENDS = "virtual/libx11 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 73674bac92..fca5be9370 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 = "virtual/x11 libxt libxft"
+DEPENDS = "virtual/libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb
index 0093a218fd..5a66d04f9d 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 = "virtual/x11 libxft"
+DEPENDS = "virtual/libx11 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 b056ea9441..efb2b69ad7 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 = "virtual/x11 startup-notification glib-2.0 libmatchbox"
+DEPENDS = "virtual/libx11 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 d04c6da160..e53ac16fa2 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
inherit autotools pkgconfig
diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb
index d847de20d0..0cf4f089cc 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
inherit autotools pkgconfig
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index c8b3ac0d3a..69a3227437 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 virtual/x11 libxt"
+DEPENDS = "tcl virtual/libx11 libxt"
RDEPENDS = "tcl"
PR = "r4"
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index ad0e0f23f2..838447fa57 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 virtual/x11 libxau libxext libxt zlib"
+DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 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 59cba88047..2b6fb5c089 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 virtual/x11 libxft xt glib-2.0 ncurses"
+DEPENDS = "gtk+ uim-native anthy fontconfig virtual/libx11 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 0206863f93..9915cd63a0 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 virtual/x11 libxt"
+DEPENDS = "libxaw virtual/libx11 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 a79f100230..c5fe202c64 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 = "virtual/x11 zlib libxmu libxaw"
+DEPENDS = "virtual/libx11 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 18ff27b428..068fc094b1 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 virtual/x11 ncurses libxft fs jpeg"
+DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 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 7239275f21..1de87c04eb 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 = "virtual/x11 xcalibrateext libxext"
+DEPENDS = "virtual/libx11 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 98c493f3ca..a5b435795a 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 = "virtual/x11 xcalibrateext libxext"
+DEPENDS = "virtual/libx11 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 ba2550261d..3979e430c0 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 = "virtual/x11 libxdamage libxcomposite libxrender"
+DEPENDS = "virtual/libx11 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 ffd6b3a918..8c1e8ae206 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 = "virtual/x11 libxpm"
+DEPENDS = "virtual/libx11 libxpm"
SECTION = "gpe"
DESCRIPTION = "Mine-sweeper game for GPE."
PRIORITY = "optional"
diff --git a/packages/xfcalendar/xfcalendar.inc b/packages/xfcalendar/xfcalendar.inc
index 8a1a5b7e20..987d8b4d67 100644
--- a/packages/xfcalendar/xfcalendar.inc
+++ b/packages/xfcalendar/xfcalendar.inc
@@ -4,5 +4,5 @@
DESCRIPTION="XFCE Calendar"
SECTION = "x11"
-DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs"
inherit xfce
diff --git a/packages/xfcalendar/xfcalendar_4.2.0.bb b/packages/xfcalendar/xfcalendar_4.2.0.bb
index 8a1a5b7e20..987d8b4d67 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 = "virtual/x11 libxfcegui4 libxfce4mcs"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs"
inherit xfce
diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc
index a4b3958493..3de7625940 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 = "virtual/x11 libxfcegui4 xfce-mcs-manager"
+DEPENDS = "virtual/libx11 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 573e2bdaa3..e43807540e 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 virtual/x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
+DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
inherit pkgconfig xfce
diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc
index 1b22894fed..380832d7c3 100644
--- a/packages/xfdesktop/xfdesktop.inc
+++ b/packages/xfdesktop/xfdesktop.inc
@@ -4,7 +4,7 @@
DESCRIPTION="xfce4 Desktop Background Manager"
SECTION = "x11/base"
-DEPENDS = "virtual/x11 libxfcegui4 libxfce4mcs libxml2"
+DEPENDS = "virtual/libx11 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 4c56b459a3..7a90487cc8 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 = "virtual/x11 libxfcegui4 libxfce4mcs libxml2"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2"
inherit xfce
PACKAGES += "xfdesktop-backdrops"
diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc
index 5af8a5f18b..1b137c4261 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 virtual/x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+DEPENDS = "startup-notification virtual/libx11 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 f23227ae60..e6fbd22b59 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 virtual/x11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+DEPENDS = "startup-notification virtual/libx11 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 6f3bf8888a..813a390c7c 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 = "virtual/x11 libxext libxpm libmatchbox"
+DEPENDS = "virtual/libx11 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 fb377cb179..97ebcbd84c 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 = "virtual/x11 libxext libxpm"
+DEPENDS = "virtual/libx11 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 cb0d42a2a6..0e58c4e833 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 += " virtual/x11 libxt"
+DEPENDS += " virtual/libx11 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 e25b3ba16a..95ef0cc62c 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 += " virtual/x11 libxscrnsaver libxt libxaw libxt"
+DEPENDS += " virtual/libx11 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 3d953e8a19..2c723fc720 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 += " virtual/x11 libxmu xbitmaps libxt"
+DEPENDS += " virtual/libx11 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 3e5736e063..a38e28f0b0 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 += " virtual/x11 libxmu xbitmaps libxt"
+DEPENDS += " virtual/libx11 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 908dc878cb..8007aca6b7 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 += " virtual/x11 libxt libxmu libxaw"
+DEPENDS += " virtual/libx11 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 b274cd549f..5cdde24099 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 += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 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 b274cd549f..5cdde24099 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 += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 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 b274cd549f..5cdde24099 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 += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 f18de41289..a96ac9d325 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 virtual/x11 libice xproxymngproto bigreqsproto zlib"
+DEPENDS += " xtrans libxext liblbxutil virtual/libx11 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 aff984e46b..9a36345429 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 virtual/x11 libxt libxmu"
+DEPENDS += " libxaw virtual/libx11 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 c83cd38c5d..e4d89bfe77 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 virtual/x11 libfontenc"
+DEPENDS += " zlib zlib virtual/libx11 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 144e600beb..8b33179a51 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 += " virtual/x11 libxfont libfs libfontenc"
+DEPENDS += " virtual/libx11 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 29e304922d..cc713f5973 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 = "virtual/x11-native libfontenc-native"
+DEPENDS = "virtual/libx11-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 dc2b681490..ac452f9edc 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 virtual/x11"
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
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 4c564a3643..d995da2a40 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 += " virtual/x11 libxmu libxext libxt"
+DEPENDS += " virtual/libx11 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 7272764f52..5d23a1afe7 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 virtual/x11 xproxymngproto"
+DEPENDS += " libice libxt virtual/libx11 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 0895ec79c8..f9d4b86f9f 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 += " virtual/x11 libxt"
+DEPENDS += " virtual/libx11 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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 e1f332e8c1..3c5bf5f926 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 29ed7358d5..f03ed310dd 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 virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
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 29ed7358d5..f03ed310dd 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 virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
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 c975c2c42d..f5fa5fb952 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 += " virtual/x11 libxext libxt libxmu"
+DEPENDS += " virtual/libx11 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 8e07c499b9..3e6143ab01 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 += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 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 4b4f4fe068..bcaa28942c 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 += " virtual/x11 libxmu libxrender libxft libxext"
+DEPENDS += " virtual/libx11 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 d9e62caa1f..64a9284f01 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 += " virtual/x11 libxau libxext libxmu"
+DEPENDS += " virtual/libx11 libxau libxext libxmu"
diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
index c1489e10a9..a944d1d51d 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 = "virtual/x11 libxau libxmu libxext"
+DEPENDS = "virtual/libx11 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 e8ee6e20a4..c3ecef6037 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 += " virtual/x11 libxaw libxrender libxft libxkbfile libxt"
+DEPENDS += " virtual/libx11 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 e8ee6e20a4..c3ecef6037 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 += " virtual/x11 libxaw libxrender libxft libxkbfile libxt"
+DEPENDS += " virtual/libx11 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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 f75a98b9d3..4f77cad470 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 += " virtual/x11 libxcursor libpng"
+DEPENDS += " virtual/libx11 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 f75a98b9d3..4f77cad470 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 += " virtual/x11 libxcursor libpng"
+DEPENDS += " virtual/libx11 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 e99c1aa768..8d424ad08a 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 virtual/x11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 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 438af7fbf6..2d78de5f08 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 virtual/x11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 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 c577aeb38a..c152ca7884 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 virtual/x11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+DEPENDS += " libxtst libxext virtual/libx11 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 06d548c9ba..df31ba68d5 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 = "virtual/x11 libxext libxtst"
+DEPENDS = "virtual/libx11 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 9ab9e1a0e7..a07f6e2f2e 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 += " virtual/x11 glproto mesa"
+DEPENDS += " virtual/libx11 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 9ab9e1a0e7..a07f6e2f2e 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 += " virtual/x11 glproto mesa"
+DEPENDS += " virtual/libx11 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 61b8ca4284..a300e62b1a 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
index e1f9a33a67..8acf2261cb 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 = "virtual/x11 libxau"
+DEPENDS = "virtual/libx11 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 6d2c81ffd6..e568238673 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 += " virtual/x11 libxau libxt libxext libxmu"
+DEPENDS += " virtual/libx11 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 4dfb42d0b3..3d1abfda69 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 += " virtual/x11 libxxf86dga libxt libxaw libxmu"
+DEPENDS += " virtual/libx11 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 41fe411756..6e2c3eb9ca 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 += " virtual/x11 libice libxt xproxymngproto"
+DEPENDS += " virtual/libx11 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 b274cd549f..5cdde24099 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 += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 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 258c980548..3673395ba4 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 += " virtual/x11 libice xproxymngproto"
+DEPENDS += " virtual/libx11 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 8f3678475a..45331d67ee 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 += " virtual/x11 libxxf86vm"
+DEPENDS += " virtual/libx11 libxxf86vm"
diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
index 1bc64ecf77..ed240dbba1 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 = "virtual/x11 libxext libxmu"
+DEPENDS = "virtual/libx11 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 ff7cacd178..370cdbbf54 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 += " virtual/x11 libxmu libxau"
+DEPENDS += " virtual/libx11 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 ff7cacd178..370cdbbf54 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 += " virtual/x11 libxmu libxau"
+DEPENDS += " virtual/libx11 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 e1f332e8c1..3c5bf5f926 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 59f7755640..df579023fb 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 aa6b46e13c..f1f76411bc 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 += " virtual/x11 libxkbfile"
+DEPENDS += " virtual/libx11 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 aa6b46e13c..f1f76411bc 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 += " virtual/x11 libxkbfile"
+DEPENDS += " virtual/libx11 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 29ed7358d5..f03ed310dd 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 virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
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 29ed7358d5..f03ed310dd 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 virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
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 29ed7358d5..f03ed310dd 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 virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
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 512ff6c6de..ef238cf69f 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 virtual/x11"
+DEPENDS += " libxaw libxkbfile virtual/libx11"
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 8e07c499b9..3e6143ab01 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 += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 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 8e07c499b9..3e6143ab01 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 += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 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 8e07c499b9..3e6143ab01 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 += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 e0149a478f..3b04dfe71d 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 40e27576a6..f99627cf8f 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
index c1fb2425d1..7f45b28a89 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 609c5643bf..c62dffdc84 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 += " virtual/x11 libxprintapputil libxaw libxprintutil libxt libxp"
+DEPENDS += " virtual/libx11 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 f1c547af4e..695554764b 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 virtual/x11"
+DEPENDS += " libxp libxprintutil virtual/libx11"
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 7bba2c74df..642a459965 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 virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
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 cccb035df6..d820b6924f 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 virtual/x11"
+DEPENDS += " libxp virtual/libx11"
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 7bba2c74df..642a459965 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 virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
index 93ddb2dbf6..1079d6a591 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 = "virtual/x11 libxmu libxext"
+DEPENDS = "virtual/libx11 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 b03804bcb6..93d96293c3 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 virtual/x11"
+DEPENDS += " libxrandr libxrender virtual/libx11"
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 b03804bcb6..93d96293c3 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 virtual/x11"
+DEPENDS += " libxrandr libxrender virtual/libx11"
diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
index f45e04115b..30a31e1569 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 virtual/x11 libxext"
+DEPENDS = "libxrandr virtual/libx11 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 7d8538be29..a0ea3b223f 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 virtual/x11 libxext"
+DEPENDS += " libxmu virtual/libx11 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 9533003b8f..0b53593c9f 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 virtual/x11 libxext"
+DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
index 191eb9897f..51a3fcd08a 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 = "virtual/x11 libxmu libxext"
+DEPENDS = "virtual/libx11 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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 831e7de68f..7782b3c4b1 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 virtual/x11 libxt libxext xtrans xproxymngproto libxau"
+DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau"
diff --git a/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
index ca41d2373d..90247fdb26 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 = "virtual/x11 libxext xextensions libxmu"
+DEPENDS = "virtual/libx11 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 ca689e55f7..f737bcbd9a 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 virtual/x11 libxxf86misc libxfontcache libxp"
+DEPENDS += " libxmu libxext virtual/libx11 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 ca689e55f7..f737bcbd9a 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 virtual/x11 libxxf86misc libxfontcache libxp"
+DEPENDS += " libxmu libxext virtual/libx11 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 6bd79a0eb8..de6b894fac 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 virtual/x11"
+DEPENDS += " libxi virtual/libx11"
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 6bd79a0eb8..de6b894fac 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 virtual/x11"
+DEPENDS += " libxi virtual/libx11"
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 99061f45c4..4f2db234b2 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 virtual/x11 xbitmaps"
+DEPENDS += " libxmu virtual/libx11 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 7bba2c74df..642a459965 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 virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index aa34d9b106..e37862baa0 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 virtual/x11 xextproto xext xau xpm ncurses"
+DEPENDS = "xproto virtual/libx11 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 fb3dca78a1..114b732ff7 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 += " virtual/x11 libxtrap"
+DEPENDS += " virtual/libx11 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 fb3dca78a1..114b732ff7 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 += " virtual/x11 libxtrap"
+DEPENDS += " virtual/libx11 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 4fdaf2427e..eb59db6922 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 virtual/x11"
+DEPENDS += " libxv virtual/libx11"
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 7bba2c74df..642a459965 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 virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
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 a871a5c6e5..55f97cb8cb 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 virtual/x11"
+DEPENDS += " libxmu libxext virtual/libx11"
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 a871a5c6e5..55f97cb8cb 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 virtual/x11"
+DEPENDS += " libxmu libxext virtual/libx11"
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 827257910a..558ed4643b 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
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 6ec014854c..d76388cfe4 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 += " virtual/x11 libxvmc drm xf86driproto"
+DEPENDS += " virtual/libx11 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 6ec014854c..d76388cfe4 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 += " virtual/x11 libxvmc drm xf86driproto"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
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 4ae26c4a14..f5acc7a670 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 += " virtual/x11 libxext xextproto applewmproto"
+DEPENDS += " virtual/libx11 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 8e14c07680..d26cad95b1 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 += " virtual/x11 libxext xextproto dmxproto"
+DEPENDS += " virtual/libx11 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 8e14c07680..d26cad95b1 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 += " virtual/x11 libxext xextproto dmxproto"
+DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
diff --git a/packages/xorg-lib/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb
index c5403f625f..e771161e59 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 598791cc40..1756a235d7 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 3d17aa561b..99be60d038 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 += " virtual/x11"
+DEPENDS += " virtual/libx11"
XORG_PN = "liboldX"
diff --git a/packages/xorg-lib/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb
index 51dbe93251..cd374649bb 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 = "virtual/x11 libice"
+DEPENDS = "virtual/libx11 libice"
DESCRIPTION = "Session management library"
PR = "r1"
diff --git a/packages/xorg-lib/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb
index ce43901aad..45d6bfa236 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 = "virtual/x11 libice"
+DEPENDS = "virtual/libx11 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 27cf01a31c..da595182f4 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 += " virtual/x11 libxext xextproto windowswmproto"
+DEPENDS += " virtual/libx11 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 54e79bf727..3faae24ea3 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 = "virtual/x11"
+PROVIDES = "virtual/libx11"
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 e738d48e73..ccf4ed5a55 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 = "virtual/x11"
+PROVIDES = "virtual/libx11"
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 e738d48e73..ccf4ed5a55 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 = "virtual/x11"
+PROVIDES = "virtual/libx11"
XORG_PN = "libX11"
diff --git a/packages/xorg-lib/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb
index b37d0e13e7..f2fd477661 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 = "virtual/x11"
+PROVIDES = "virtual/libx11"
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 347d4c1386..32e47f013c 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 = "virtual/x11"
+PROVIDES = "virtual/libx11"
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 883886efb2..04f2855101 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 virtual/x11 libxt libxmu libxpm"
+DEPENDS = "xproto virtual/libx11 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 a558b889ae..dcb73a19ea 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 virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+DEPENDS += " xproto virtual/libx11 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 a558b889ae..dcb73a19ea 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 virtual/x11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+DEPENDS += " xproto virtual/libx11 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 da21df75c3..2c696ceba2 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 virtual/x11 libxt libxmu libxpm"
+DEPENDS = "xproto virtual/libx11 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 987a7043b5..a60f8d5179 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 = "virtual/x11 compositeext xextensions libxfixes"
+DEPENDS = "virtual/libx11 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 ee5b2f7358..a9ee4190c2 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 virtual/x11 libxfixes"
+DEPENDS += " compositeproto virtual/libx11 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 ee5b2f7358..a9ee4190c2 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 virtual/x11 libxfixes"
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
PROVIDES = "xcomposite"
XORG_PN = "libXcomposite"
diff --git a/packages/xorg-lib/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb
index 922488593a..fd31b5dbff 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 = "virtual/x11 compositeext xextensions libxfixes"
+DEPENDS = "virtual/libx11 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 25f1c15d78..65f8432a21 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 virtual/x11 fixesproto"
+DEPENDS += " libxrender libxfixes virtual/libx11 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 25f1c15d78..65f8432a21 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 virtual/x11 fixesproto"
+DEPENDS += " libxrender libxfixes virtual/libx11 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 c2e9ab0ae0..a132b751c0 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 = "virtual/x11 damageext libxfixes xproto"
+DEPENDS = "virtual/libx11 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 258ec25203..a6105f07a6 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 += " virtual/x11 damageproto libxfixes fixesproto xextproto"
+DEPENDS += " virtual/libx11 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 258ec25203..a6105f07a6 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 += " virtual/x11 damageproto libxfixes fixesproto xextproto"
+DEPENDS += " virtual/libx11 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 41f7846888..a613d0e673 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 = "virtual/x11 damageext libxfixes xproto"
+DEPENDS = "virtual/libx11 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 1697278938..36af0189df 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 virtual/x11 xextproto libxext evieext"
+DEPENDS += " xproto virtual/libx11 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 1697278938..36af0189df 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 virtual/x11 xextproto libxext evieext"
+DEPENDS += " xproto virtual/libx11 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 27f7c1c96e..bdf33d354d 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 = "virtual/x11-native xextensions-native"
+DEPENDS = "virtual/libx11-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 d16fc00f5b..1a794e161d 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 virtual/x11 xextproto libxau"
+DEPENDS += " xproto virtual/libx11 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 d16fc00f5b..1a794e161d 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 virtual/x11 xextproto libxau"
+DEPENDS += " xproto virtual/libx11 xextproto libxau"
PROVIDES = "xext"
XORG_PN = "libXext"
diff --git a/packages/xorg-lib/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb
index 3193857eb8..101c240c5e 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 virtual/x11 xextensions"
+DEPENDS = "xproto virtual/libx11 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 2c86445d74..ceebdfaa11 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 = "virtual/x11 fixesext"
+DEPENDS = "virtual/libx11 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 f39b08b3ae..594675b115 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 += " virtual/x11 xproto fixesproto xextproto"
+DEPENDS += " virtual/libx11 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 f39b08b3ae..594675b115 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 += " virtual/x11 xproto fixesproto xextproto"
+DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
XORG_PN = "libXfixes"
diff --git a/packages/xorg-lib/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb
index 50d01a1f21..92bad48eeb 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 = "virtual/x11 fixesext"
+DEPENDS = "virtual/libx11 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 b4cf34f438..498bdac0ac 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 += " virtual/x11 libxext xextproto fontcacheproto"
+DEPENDS += " virtual/libx11 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 b4cf34f438..498bdac0ac 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 += " virtual/x11 libxext xextproto fontcacheproto"
+DEPENDS += " virtual/libx11 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 03abf5a6ab..a793925596 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 = "virtual/x11 xproto libxrender freetype fontconfig"
+DEPENDS = "virtual/libx11 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 e1cc3ceb7b..38ba5a6d5c 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 = "virtual/x11 xproto libxrender freetype fontconfig"
+DEPENDS = "virtual/libx11 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 8900afdc6f..b9958ea6ac 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 virtual/x11 xextensions"
+DEPENDS = "xproto virtual/libx11 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 8ba01c923b..b8bdbe970e 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 virtual/x11 xextproto libxext inputproto"
+DEPENDS += " xproto virtual/libx11 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 8ba01c923b..b8bdbe970e 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 virtual/x11 xextproto libxext inputproto"
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
XORG_PN = "libXi"
diff --git a/packages/xorg-lib/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb
index 191e90a2ec..f37c78e819 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 virtual/x11 xextensions"
+DEPENDS = "xproto virtual/libx11 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 d2d4e31027..eb4a6d54cf 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 virtual/x11 libxext"
+DEPENDS = "panoramixext xproto virtual/libx11 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 4036f17fd8..429c2fc4d0 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 virtual/x11 libxext"
+DEPENDS = "panoramixext xproto virtual/libx11 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 4904bfd840..3a11ea9854 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 += " virtual/x11 libxext xextproto xineramaproto"
+DEPENDS += " virtual/libx11 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 10604909f6..5138367bbf 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 virtual/x11 libxext"
+DEPENDS = "panoramixext xproto virtual/libx11 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 eb73c0f4c4..c02dca34b7 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 += " virtual/x11 kbproto"
+DEPENDS += " virtual/libx11 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 eb73c0f4c4..c02dca34b7 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 += " virtual/x11 kbproto"
+DEPENDS += " virtual/libx11 kbproto"
diff --git a/packages/xorg-lib/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb
index de63e64057..336caf139a 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 = "virtual/x11"
+DEPENDS = "virtual/libx11"
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 af76b740a3..1d841e4913 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 += " virtual/x11 libxt libxkbfile"
+DEPENDS += " virtual/libx11 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 af76b740a3..1d841e4913 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 += " virtual/x11 libxt libxkbfile"
+DEPENDS += " virtual/libx11 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 7f3d946dff..3b82bb0218 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 virtual/x11"
+DEPENDS += " libxt libxext xextproto virtual/libx11"
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 7f3d946dff..3b82bb0218 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 virtual/x11"
+DEPENDS += " libxt libxext xextproto virtual/libx11"
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 5565f35010..fc01924819 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 += " virtual/x11 libxext xextproto libxau printproto"
+DEPENDS += " virtual/libx11 libxext xextproto libxau printproto"
XORG_PN = "libXp"
diff --git a/packages/xorg-lib/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb
index 0d31fd6bca..e434e089cf 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 = "virtual/x11 libxext"
+DEPENDS = "virtual/libx11 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 69a2d5953a..8447cd3630 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 virtual/x11"
+DEPENDS = "xproto virtual/libx11"
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 b99596f5f1..263a24db1f 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 virtual/x11 libxt libxext xextproto"
+DEPENDS += " xproto virtual/libx11 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 b99596f5f1..263a24db1f 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 virtual/x11 libxt libxext xextproto"
+DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
XORG_PN = "libXpm"
diff --git a/packages/xorg-lib/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb
index 3e625a1dd4..4d4d534e9a 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 virtual/x11"
+DEPENDS = "xproto virtual/libx11"
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 a8fcd93f69..9431f9fbfa 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 += " virtual/x11 libxp libxprintutil printproto libxau"
+DEPENDS += " virtual/libx11 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 c0d1244a26..c03e569e4f 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 += " virtual/x11 libxp libxt printproto libxau"
+DEPENDS += " virtual/libx11 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 ddb1f61556..d87471af05 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 virtual/x11 libxrender libxext"
+DEPENDS = "randrext virtual/libx11 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 42062b5902..22ae2a5f6c 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 += " virtual/x11 randrproto libxext xextproto libxrender renderproto"
+DEPENDS += " virtual/libx11 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 42062b5902..22ae2a5f6c 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 += " virtual/x11 randrproto libxext xextproto libxrender renderproto"
+DEPENDS += " virtual/libx11 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 44b34f07d3..12f3b4ef38 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 virtual/x11 libxrender libxext"
+DEPENDS = "randrext virtual/libx11 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 129cc58bbb..32e1962f26 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 virtual/x11"
+DEPENDS = "renderext virtual/libx11"
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 6f6fe2a7f9..865cf02d42 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 += " virtual/x11 renderproto"
+DEPENDS += " virtual/libx11 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 6f6fe2a7f9..865cf02d42 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 += " virtual/x11 renderproto"
+DEPENDS += " virtual/libx11 renderproto"
XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb
index 49a3f4204a..31a710643c 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 virtual/x11"
+DEPENDS = "renderext virtual/libx11"
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 752ef865fd..3f0d32bfe4 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 = "virtual/x11 xextensions libxext resourceext"
+DEPENDS = "virtual/libx11 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 ed49e72be6..98da017f09 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 += " virtual/x11 libxext xextproto resourceproto"
+DEPENDS += " virtual/libx11 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 ed49e72be6..98da017f09 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 += " virtual/x11 libxext xextproto resourceproto"
+DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
XORG_PN = "libXres"
diff --git a/packages/xorg-lib/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb
index 0c19870e16..a457d6c14f 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 = "virtual/x11 xextensions libxext resourceext"
+DEPENDS = "virtual/libx11 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 c41dbe5a12..d6b13a8c6c 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 += " virtual/x11 libxext xextproto scrnsaverproto"
+DEPENDS += " virtual/libx11 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 c41dbe5a12..d6b13a8c6c 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 += " virtual/x11 libxext xextproto scrnsaverproto"
+DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
XORG_PN = "libXScrnSaver"
diff --git a/packages/xorg-lib/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb
index 36d3d5956b..614133fce7 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 = "virtual/x11 libxext"
+DEPENDS = "virtual/libx11 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 4d8139b850..9c31075285 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 = "virtual/x11 libsm"
+DEPENDS = "virtual/libx11 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 7c7054270a..33787e3482 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 virtual/x11 xproto kbproto"
+DEPENDS += " libsm virtual/libx11 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 7c7054270a..33787e3482 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 virtual/x11 xproto kbproto"
+DEPENDS += " libsm virtual/libx11 xproto kbproto"
PROVIDES = "xt"
XORG_PN = "libXt"
diff --git a/packages/xorg-lib/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb
index 6f8a66d0bd..3fd2eabe67 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 = "virtual/x11 libsm"
+DEPENDS = "virtual/libx11 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 7f59ec2621..0c87974979 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 += " virtual/x11 libxt trapproto libxext xextproto"
+DEPENDS += " virtual/libx11 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 01bcada964..9aeda79540 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 += " virtual/x11 libxext recordproto xextproto inputproto"
+DEPENDS += " virtual/libx11 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 875cd0914b..dc3e358d64 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 = "virtual/x11 recordext libxext"
+DEPENDS = "virtual/libx11 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 e8f01379fd..93c41ce126 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 = "virtual/x11 libxext"
+DEPENDS = "virtual/libx11 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 e88a35f1cd..d42302979e 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 = "virtual/x11 libxext"
+DEPENDS = "virtual/libx11 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 be3cacf4df..8680f050e3 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 += " virtual/x11 libxext xextproto videoproto"
+DEPENDS += " virtual/libx11 libxext xextproto videoproto"
XORG_PN = "libXv"
diff --git a/packages/xorg-lib/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb
index 6fa8c8a272..f256211962 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 = "virtual/x11 libxext libxv drm xserver-xorg"
+DEPENDS = "virtual/libx11 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 55cbc58265..ff8dda58a6 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 = "virtual/x11 libxext libxv drm xserver-xorg"
+DEPENDS = "virtual/libx11 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 d322ecfb33..d9be65baa0 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 = "virtual/x11 libxext libxv drm xserver-xorg"
+DEPENDS = "virtual/libx11 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 aef95aaf60..42bb0062ab 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 += " virtual/x11 libxext libxv xextproto videoproto"
+DEPENDS += " virtual/libx11 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 aef95aaf60..42bb0062ab 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 += " virtual/x11 libxext libxv xextproto videoproto"
+DEPENDS += " virtual/libx11 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 30e979cf7d..a5eca04252 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 virtual/x11 xextproto libxext xf86dgaproto"
+DEPENDS += " xproto virtual/libx11 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 30e979cf7d..a5eca04252 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 virtual/x11 xextproto libxext xf86dgaproto"
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
XORG_PN = "libXxf86dga"
diff --git a/packages/xorg-lib/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb
index cb91e2eb2d..d110e7e4c0 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 = "virtual/x11 libxext xxf86dgaext"
+DEPENDS = "virtual/libx11 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 c6a95ddfd0..6c55f11a97 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 virtual/x11 xextproto libxext xf86miscproto"
+DEPENDS += " xproto virtual/libx11 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 c6a95ddfd0..6c55f11a97 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 virtual/x11 xextproto libxext xf86miscproto"
+DEPENDS += " xproto virtual/libx11 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 c6b0ed5bfb..b9268ddaf9 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 virtual/x11 xextproto libxext xf86vidmodeproto"
+DEPENDS += " xproto virtual/libx11 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 c6b0ed5bfb..b9268ddaf9 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 virtual/x11 xextproto libxext xf86vidmodeproto"
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
XORG_PN = "libXxf86vm"
diff --git a/packages/xorg-lib/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb
index a045adf458..5464c4330c 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 = "virtual/x11 libxext xxf86vmext"
+DEPENDS = "virtual/libx11 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 3683562543..b7e192dc76 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 virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
diff --git a/packages/xorg-xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb
index 8cbde48ebd..c198a94de2 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 virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
# Uncomment the following DEPENDS line and the commented line in SRC_URI
# to make this snapshot build against X11R7.0 xlibs.
-#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
+#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 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 fb6229e51f..f9ba323529 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 virtual/x11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb
index 44a91ae1e9..594b6d74ec 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 virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 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 2a572bea53..a7c92dcb83 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 virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 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 c6d4a17e20..c2b25973fb 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 virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 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 71522c2909..e667e36f2c 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 virtual/x11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 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 c26836893d..e007029b9b 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 virtual/x11 gtk+ libxml2 libglade"
+DEPENDS = "intltool virtual/libx11 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 a7e457935c..d3b8e20022 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 virtual/x11 gtk+ libxml2 libglade"
+DEPENDS = "intltool virtual/libx11 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 e33a4c8223..ca4afd2e6b 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 = "virtual/x11 xft libxtst libxpm"
+DEPENDS = "virtual/libx11 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 d53aabe4bf..f2008506b5 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 = "virtual/x11 libxft libxrandr"
+DEPENDS = "virtual/libx11 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 9642be132a..ff0346f9d9 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 = "virtual/x11 libxft libxrandr xcalibrate"
+DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
PR = "r1"
diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb
index cec5782236..8f5a62c980 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 = "virtual/x11 libxft libxrandr xcalibrate"
+DEPENDS = "virtual/libx11 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 c8e7657ffb..682ed2258a 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 = "virtual/x11 libxft libxrandr xcalibrate"
+DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
PR = "r1"