summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-08-06 19:31:33 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-08-06 19:31:33 +0000
commit71cd75a213bb84bce4e549ee8e706f59d25df0a6 (patch)
treee8926624ca7df691e64135dbcfc988dbcf70e6c8
parentd176cd1e6ca20969457b05be43fdaf885e08df02 (diff)
parent536be8a5c6846d5ff1fc4eb43bff0c04928deb57 (diff)
merge of 'd486b07ff3f411bc579cba692283881327e49742'
and 'd80fca2b777ef3a788e49ac766b51ac24e27b4fa'
-rw-r--r--classes/binconfig.bbclass2
-rw-r--r--classes/image.bbclass3
-rw-r--r--classes/openmoko2.bbclass1
-rw-r--r--conf/distro/angstrom-2007.1.conf4
-rw-r--r--conf/distro/include/preferred-xorg-versions.inc111
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/c7x0.conf4
-rw-r--r--conf/machine/include/poodle-2.6.conf2
-rw-r--r--conf/machine/include/zaurus-2.6.inc (renamed from conf/machine/include/zaurus-2.6.conf)27
-rw-r--r--conf/machine/include/zaurus-clamshell.inc (renamed from conf/machine/include/zaurus-clamshell.conf)0
-rw-r--r--conf/machine/poodle.conf2
-rw-r--r--conf/machine/spitz.conf4
-rw-r--r--conf/machine/tosa.conf2
-rw-r--r--packages/angstrom/angstrom-x11-base-depends.bb3
-rw-r--r--packages/autoconf/autoconf_2.61.bb2
-rw-r--r--packages/bridge-utils/bridge-utils_1.2.bb13
-rw-r--r--packages/gstreamer/gst-meta-base_0.10.bb52
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.7-9.bb16
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.8.bb10
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.9.bb2
-rw-r--r--packages/libmimedir/libmimedir_0.4.2.bb19
-rw-r--r--packages/libsndfile/libsndfile1_1.0.17.bb17
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.21/defconfig2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.6.bb2
-rw-r--r--packages/linux/linux-omap1.inc13
-rw-r--r--packages/openmoko-apps/openmoko-terminal_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb5
-rw-r--r--packages/pkgconfig/pkgconfig-0.22/autofoo.patch513
-rw-r--r--packages/pkgconfig/pkgconfig-native_0.22.bb11
-rw-r--r--packages/pkgconfig/pkgconfig.inc24
-rw-r--r--packages/pkgconfig/pkgconfig_0.15.0.bb2
-rw-r--r--packages/pkgconfig/pkgconfig_0.22.bb31
-rw-r--r--packages/tasks/task-slugos.bb5
-rw-r--r--packages/xorg-app/appres_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/beforelight_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/bitmap_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-app/bitmap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/editres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/iceauth_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/ico_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/listres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/luit_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb10
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/oclock_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/rgb_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/rgb_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-app/rstart_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/rstart_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/scripts_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/sessreg_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/showfont_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/smproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/smproxy_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/twm_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/viewres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/x11perf_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/x11perf_X11R7.1-1.4.1.bb5
-rw-r--r--packages/xorg-app/xauth_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xbiff_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xcalc_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclock_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclock_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xconsole_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xconsole_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xditview_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xdm_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xdm_X11R7.1-1.0.4.bb7
-rw-r--r--packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-app/xedit_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xedit_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xev_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xeyes_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfs_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfs_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfwp_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xgamma_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xgc_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xhost_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-app/xhost_X11R7.1-1.0.1.bb7
-rw-r--r--packages/xorg-app/xinit_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xinit_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkill_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xload_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlogo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmag_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xman_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xman_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-app/xmessage_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmh_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb7
-rw-r--r--packages/xorg-app/xmore_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xpr_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprop_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xrandr_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xrandr_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xrdb_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xrdb_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xrx_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xset_X11R7.0-1.0.1.bb12
-rw-r--r--packages/xorg-app/xset_X11R7.1-1.0.2.bb12
-rw-r--r--packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xsm_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xtrap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xtrap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xwud_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb9
-rw-r--r--packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb7
-rw-r--r--packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb6
-rw-r--r--packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb8
-rw-r--r--packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb5
-rw-r--r--packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb7
-rw-r--r--packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb5
-rw-r--r--packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-font/encodings_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-font/font-alias_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb11
-rw-r--r--packages/xorg-font/font-util_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-util_X11R7.1-1.0.1.bb9
-rw-r--r--packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb13
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb13
-rw-r--r--packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb5
-rw-r--r--packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb11
-rw-r--r--packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb11
-rw-r--r--packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libfs_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libice_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libice_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libsm_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xorg-lib/libsm_X11R7.1-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb24
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb27
-rw-r--r--packages/xorg-lib/libx11_1.1.1.bb15
-rw-r--r--packages/xorg-lib/libx11_1.1.2.bb12
-rw-r--r--packages/xorg-lib/libx11_X11R7.0-1.0.0.bb21
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb26
-rw-r--r--packages/xorg-lib/libx11_git.bb16
-rw-r--r--packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxau_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxau_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb15
-rw-r--r--packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb21
-rw-r--r--packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb11
-rw-r--r--packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb11
-rw-r--r--packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb10
-rw-r--r--packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb10
-rw-r--r--packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb10
-rw-r--r--packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb10
-rw-r--r--packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxext_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxext_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb9
-rw-r--r--packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb9
-rw-r--r--packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb12
-rw-r--r--packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb12
-rw-r--r--packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb15
-rw-r--r--packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb11
-rw-r--r--packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb17
-rw-r--r--packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxft_X11R7.0-2.1.12.bb23
-rw-r--r--packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb19
-rw-r--r--packages/xorg-lib/libxi_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxi_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb8
-rw-r--r--packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb16
-rw-r--r--packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb16
-rw-r--r--packages/xorg-lib/libxp_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb13
-rw-r--r--packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb13
-rw-r--r--packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb9
-rw-r--r--packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb9
-rw-r--r--packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb9
-rw-r--r--packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb9
-rw-r--r--packages/xorg-lib/libxres_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxres_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb13
-rw-r--r--packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb13
-rw-r--r--packages/xorg-lib/libxt_X11R7.0-1.0.0.bb19
-rw-r--r--packages/xorg-lib/libxt_X11R7.1-1.0.2.bb19
-rw-r--r--packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxv_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb6
-rw-r--r--packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb8
-rw-r--r--packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb6
-rw-r--r--packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb7
-rw-r--r--packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb7
-rw-r--r--packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb7
-rw-r--r--packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb5
-rw-r--r--packages/xorg-proto/evieext_X11R7.0-1.0.2.bb5
-rw-r--r--packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb7
-rw-r--r--packages/xorg-proto/fixesproto_X11R7.1-4.0.bb7
-rw-r--r--packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb8
-rw-r--r--packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb5
-rw-r--r--packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb8
-rw-r--r--packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb5
-rw-r--r--packages/xorg-proto/glproto_X11R7.0-1.4.3.bb5
-rw-r--r--packages/xorg-proto/glproto_X11R7.1-1.4.7.bb5
-rw-r--r--packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb8
-rw-r--r--packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb5
-rw-r--r--packages/xorg-proto/inputproto_X11R7.1-1.4.bb4
-rw-r--r--packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb8
-rw-r--r--packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb5
-rw-r--r--packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb8
-rw-r--r--packages/xorg-proto/printproto_X11R7.0-1.0.3.bb5
-rw-r--r--packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb7
-rw-r--r--packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb7
-rw-r--r--packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb7
-rw-r--r--packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb7
-rw-r--r--packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb5
-rw-r--r--packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb5
-rw-r--r--packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb5
-rw-r--r--packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb5
-rw-r--r--packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb8
-rw-r--r--packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb10
-rw-r--r--packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb7
-rw-r--r--packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb8
-rw-r--r--packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb7
-rw-r--r--packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb5
-rw-r--r--packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb5
-rw-r--r--packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb7
-rw-r--r--packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb8
-rw-r--r--packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb8
-rw-r--r--packages/xorg-proto/xproto_X11R7.0-7.0.4.bb5
-rw-r--r--packages/xorg-proto/xproto_X11R7.1-7.0.5.bb5
-rw-r--r--packages/xorg-proto/xproto_X11R7.1-7.0.8.bb10
-rw-r--r--packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb6
-rw-r--r--packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-util/imake_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/imake_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-util/lndir_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-util/makedepend_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb9
-rw-r--r--packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb11
-rw-r--r--packages/xorg-util/util-macros_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/util-macros_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-util/util-macros_X11R7.1-1.1.5.bb10
-rw-r--r--packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb51
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch13
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch14
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/kmode.patch19
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb23
-rw-r--r--packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb47
-rw-r--r--packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff464
-rw-r--r--packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb18
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb11
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb11
-rw-r--r--packages/xscrnsaverh/xscrnsaverh_1.0.bb2
515 files changed, 848 insertions, 4060 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index dadf2dddfc..497b78f454 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -18,6 +18,8 @@ def get_binconfig_mangle(d):
s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+ s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
+ s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
return s
BINCONFIG_GLOB ?= "*-config"
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 101b53307a..248ccab60b 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -58,6 +58,7 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
ROOTFS_POSTPROCESS_COMMAND ?= ""
+MACHINE_POSTPROCESS_COMMAND ?= ""
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
@@ -100,6 +101,8 @@ fakeroot do_rootfs () {
done
${IMAGE_POSTPROCESS_COMMAND}
+
+ ${MACHINE_POSTPROCESS_COMMAND}
}
insert_feed_uris () {
diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index 5948cb3451..17b3bbafa6 100644
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -30,5 +30,4 @@ FILES_${PN} += "${datadir}/icons"
# SVNREV = "r${SRCREV}"
SVNREV = "${SRCDATE}"
-SRCDATE = "tomorrow"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index e83ef90280..0ef38f2f86 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -233,7 +233,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+require conf/distro/include/preferred-xorg-versions.inc
# Virtuals:
@@ -261,7 +261,7 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
new file mode 100644
index 0000000000..0681b01d3d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,111 @@
+PREFERRED_VERSION_applewmproto = "1.0.3"
+PREFERRED_VERSION_bigreqsproto = "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native = "1.0.2"
+PREFERRED_VERSION_compositeproto = "0.4"
+PREFERRED_VERSION_damageproto = "1.1.0"
+PREFERRED_VERSION_diet-x11 = "1.1.2"
+PREFERRED_VERSION_dmxproto = "2.2.2"
+PREFERRED_VERSION_evieext = "1.0.2"
+PREFERRED_VERSION_fixesproto = "4.0"
+PREFERRED_VERSION_fontcacheproto = "0.1.2"
+PREFERRED_VERSION_fontcacheproto-native = "0.1.2"
+PREFERRED_VERSION_fontsproto = "2.0.2"
+PREFERRED_VERSION_fontsproto-native = "2.0.2"
+PREFERRED_VERSION_gccmakedep = "1.0.2"
+PREFERRED_VERSION_glproto = "1.4.8"
+PREFERRED_VERSION_imake = "1.0.2"
+PREFERRED_VERSION_inputproto = "1.4.2"
+PREFERRED_VERSION_inputproto-native = "1.4.1"
+PREFERRED_VERSION_kbproto = "1.0.3"
+PREFERRED_VERSION_kbproto-native = "1.0.2"
+PREFERRED_VERSION_libapplewm = "1.0.0"
+PREFERRED_VERSION_libdmx = "1.0.2"
+PREFERRED_VERSION_libfontenc = "1.0.4"
+PREFERRED_VERSION_libfontenc-native = "1.0.4"
+PREFERRED_VERSION_libfs = "1.0.0"
+PREFERRED_VERSION_libice = "1.0.3"
+PREFERRED_VERSION_liblbxutil = "1.0.1"
+PREFERRED_VERSION_liboldx = "1.0.1"
+PREFERRED_VERSION_libsm = "1.0.3"
+PREFERRED_VERSION_libwindowswm = "1.0.0"
+PREFERRED_VERSION_libx11 = "1.1.2"
+PREFERRED_VERSION_libx11-native = "1.0.1"
+PREFERRED_VERSION_libxau = "1.0.3"
+PREFERRED_VERSION_libxau-native = "1.0.3"
+PREFERRED_VERSION_libxaw = "1.0.3"
+PREFERRED_VERSION_libxcomposite = "0.4.0"
+PREFERRED_VERSION_libxcursor = "1.1.8"
+PREFERRED_VERSION_libxdamage = "1.1.1"
+PREFERRED_VERSION_libxdmcp = "1.0.2"
+PREFERRED_VERSION_libxdmcp-native = "1.0.2"
+PREFERRED_VERSION_libxevie = "1.0.2"
+PREFERRED_VERSION_libxext = "1.0.3"
+PREFERRED_VERSION_libxfixes = "4.0.3"
+PREFERRED_VERSION_libxfont = "1.3.0"
+PREFERRED_VERSION_libxfont-native = "1.3.0"
+PREFERRED_VERSION_libxfontcache = "1.0.4"
+PREFERRED_VERSION_libxft = "2.1.12"
+PREFERRED_VERSION_libxi = "1.1.2"
+PREFERRED_VERSION_libxinerama = "1.0.2"
+PREFERRED_VERSION_libxkbfile = "1.0.4"
+PREFERRED_VERSION_libxkbui = "1.0.2"
+PREFERRED_VERSION_libxmu = "1.0.3"
+PREFERRED_VERSION_libxp = "1.0.0"
+PREFERRED_VERSION_libxpm = "3.5.6"
+PREFERRED_VERSION_libxprintapputil = "1.0.1"
+PREFERRED_VERSION_libxprintutil = "1.0.1"
+PREFERRED_VERSION_libxrandr = "1.2.1"
+PREFERRED_VERSION_libxrender = "0.9.2"
+PREFERRED_VERSION_libxres = "1.0.3"
+PREFERRED_VERSION_libxscrnsaver = "1.1.2"
+PREFERRED_VERSION_libxt = "1.0.5"
+PREFERRED_VERSION_libxtrap = "1.0.0"
+PREFERRED_VERSION_libxtst = "1.0.2"
+PREFERRED_VERSION_libxv = "1.0.3"
+PREFERRED_VERSION_libxvmc = "1.0.4"
+PREFERRED_VERSION_libxxf86dga = "1.0.1"
+PREFERRED_VERSION_libxxf86misc = "1.0.1"
+PREFERRED_VERSION_libxxf86vm = "1.0.1"
+PREFERRED_VERSION_lndir = "1.0.1"
+PREFERRED_VERSION_makedepend = "1.0.1"
+PREFERRED_VERSION_makedepend-native = "1.0.1"
+PREFERRED_VERSION_printproto = "1.0.3"
+PREFERRED_VERSION_randrproto = "1.2.1"
+PREFERRED_VERSION_recordproto = "1.13.2"
+PREFERRED_VERSION_renderproto = "0.9.2"
+PREFERRED_VERSION_resourceproto = "1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "1.1.0"
+PREFERRED_VERSION_trapproto = "3.4.3"
+PREFERRED_VERSION_util-macros = "1.1.5"
+PREFERRED_VERSION_util-macros-native = "1.1.5"
+PREFERRED_VERSION_videoproto = "2.2.2"
+PREFERRED_VERSION_windowswmproto = "1.0.3"
+PREFERRED_VERSION_xauth = "1.0.2"
+PREFERRED_VERSION_xcmiscproto = "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native = "1.1.2"
+PREFERRED_VERSION_xdpyinfo = "1.0.2"
+PREFERRED_VERSION_xextproto = "7.0.2"
+PREFERRED_VERSION_xextproto-native = "7.0.2"
+PREFERRED_VERSION_xf86bigfontproto = "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "2.0.2"
+PREFERRED_VERSION_xf86driproto = "2.0.3"
+PREFERRED_VERSION_xf86miscproto = "0.9.2"
+PREFERRED_VERSION_xf86rushproto = "1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "2.2.2"
+PREFERRED_VERSION_xhost = "1.0.2"
+PREFERRED_VERSION_xineramaproto = "1.1.2"
+PREFERRED_VERSION_xmodmap = "1.0.2"
+PREFERRED_VERSION_xorg-cf-files = "1.0.2"
+PREFERRED_VERSION_xproto = "7.0.10"
+PREFERRED_VERSION_xproto-native = "7.0.10"
+PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
+PREFERRED_VERSION_xrandr = "1.2.2"
+PREFERRED_VERSION_xrdb = "1.0.3"
+PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+PREFERRED_VERSION_xserver-xorg = "1.1.0"
+PREFERRED_VERSION_xset = "1.0.2"
+PREFERRED_VERSION_xtrans = "1.0.3"
+PREFERRED_VERSION_xtrans-native = "1.0.3"
+PREFERRED_VERSION_xinit = "1.0.4"
+PREFERRED_VERSION_xev = "1.0.2"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index bb1605e41b..00b9440b1f 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.4"
+SLUGOS_VERSION = "4.5"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index fad73c53bf..de94f560f9 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C1000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PACKAGE_EXTRA_ARCHS += "iwmmxt"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 098d0526f0..6862a8095f 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 01a06b7c27..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc
index ada838f0d6..a9702cfce2 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -40,3 +40,30 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS_poodle = "smallscreen"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkdir ${IMAGE_NAME}-installkit/
+
+ # Get the latest kernel using the zImage-<machine>.bin symlink
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+
+ if [ "${MACHINE}" = "spitz" ]; then
+ cp gnu-tar ${IMAGE_NAME}-installkit/
+ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+ else
+ cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+ fi
+
+ # All zaurus machines except collie need updater.sh
+ if [ "${MACHINE}" != "collie" ]; then
+ cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+ fi
+
+ tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+ md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.inc
index f66502eff1..f66502eff1 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.inc
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index a548f513d3..eee1edd53e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -2,6 +2,6 @@
#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 81c789dcc4..3199065606 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C3000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ddaf6e03c9..83227ee0c4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -2,7 +2,7 @@
#@NAME: Sharp Zaurus SL-6000
#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
# newer kernels does not build
PREFERRED_VERSION_linux-rp = "2.6.17"
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index 036e513547..2eb3a36804 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r33"
+PR = "r34"
ALLOW_EMPTY = "1"
XSERVER ?= "xserver-kdrive-fbdev"
@@ -9,7 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS = "virtual/xserver"
RDEPENDS = "\
- virtual/libx11 \
${XSERVER} \
ttf-dejavu-sans \
ttf-dejavu-sans-mono \
diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb
index e6a452c9a0..1fad7ef7cb 100644
--- a/packages/autoconf/autoconf_2.61.bb
+++ b/packages/autoconf/autoconf_2.61.bb
@@ -1,5 +1,7 @@
require autoconf.inc
+PARALLEL_MAKE = ""
+
DEPENDS += "m4-native"
RDEPENDS_${PN} = "m4 gnu-config"
diff --git a/packages/bridge-utils/bridge-utils_1.2.bb b/packages/bridge-utils/bridge-utils_1.2.bb
new file mode 100644
index 0000000000..3f1f25dc3f
--- /dev/null
+++ b/packages/bridge-utils/bridge-utils_1.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Tools for ethernet bridging."
+HOMEPAGE = "http://bridge.sourceforge.net/"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "sysfsutils"
+RRECOMMENDS = "kernel-module-bridge"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
new file mode 100644
index 0000000000..40b5b19b20
--- /dev/null
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -0,0 +1,52 @@
+# Copyright (C) 2006,2007 OpenedHand LTD
+
+DESCRIPTION = "Gstreamer package groups"
+DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly"
+PR = "r3"
+
+PACKAGES = "\
+ gst-meta-base \
+ gst-meta-audio \
+ gst-meta-debug \
+ gst-meta-video"
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_gst-meta-base = "\
+ gstreamer \
+ gst-plugin-playbin \
+ gst-plugin-decodebin \
+ gst-plugin-gnomevfs \
+ gst-plugin-alsa \
+ gst-plugin-volume \
+ gst-plugin-ximagesink \
+ gst-plugin-audioconvert \
+ gst-plugin-audioresample \
+ gst-plugin-typefindfunctions \
+ gst-plugin-videoscale \
+ gst-plugin-ffmpegcolorspace \
+ gst-plugin-autodetect"
+
+
+RDEPENDS_gst-meta-audio = "\
+ gst-meta-base \
+ gst-plugin-ivorbis \
+ gst-plugin-ogg \
+ gst-plugin-mad"
+
+
+RDEPENDS_gst-meta-debug = "\
+ gst-meta-base \
+ gst-plugin-debug \
+ gst-plugin-audiotestsrc \
+ gst-plugin-videotestsrc"
+
+
+RDEPENDS_gst-meta-video = "\
+ gst-meta-base \
+ gst-plugin-avi \
+ gst-plugin-matroska \
+ gst-plugin-mpeg2dec"
+
+RRECOMMENDS_gst-meta-video = "\
+ gst-meta-audio"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
deleted file mode 100644
index 7f1a54f4b1..0000000000
--- a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-
-LICENSE = "GPL"
-PR = "r3"
-
-inherit gpe pkgconfig
-
-DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss"
-SECTION = "x11/base"
-RDEPENDS = "apm"
-
-DESCRIPTION = "Automatic sleep/suspend control daemon"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
-
-#CPPFLAGS_append += " -DDEBUG"
-#CFLAGS_append += " -DDEBUG"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.8.bb b/packages/ipaq-sleep/ipaq-sleep_0.8.bb
deleted file mode 100644
index 184a042d61..0000000000
--- a/packages/ipaq-sleep/ipaq-sleep_0.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss"
-SECTION = "x11/base"
-RDEPENDS = "apm"
-
-DESCRIPTION = "Automatic sleep/suspend control daemon"
-
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
index 2855dcd965..d41cacdf58 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/libx11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/libmimedir/libmimedir_0.4.2.bb b/packages/libmimedir/libmimedir_0.4.2.bb
new file mode 100644
index 0000000000..2f7cc4c3e8
--- /dev/null
+++ b/packages/libmimedir/libmimedir_0.4.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "intltool-native"
+PR = "r0"
+
+inherit autotools pkgconfig gpe
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+PACKAGES += "libmimedir-utils"
+FILES_libmimedir-utils = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libsndfile/libsndfile1_1.0.17.bb b/packages/libsndfile/libsndfile1_1.0.17.bb
new file mode 100644
index 0000000000..cf3b6d8e48
--- /dev/null
+++ b/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "An audio format Conversion library"
+HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
+AUTHOR = "Erik de Castro Lopo"
+SECTION = "libs/multimedia"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz"
+S = "${WORKDIR}/libsndfile-${PV}"
+
+inherit autotools lib_package pkgconfig
+
+do_stage() {
+ oe_libinstall -a -so -C src libsndfile ${STAGING_LIBDIR}
+ install -m 0644 ${S}/src/sndfile.h ${STAGING_INCDIR}/
+}
+
diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
index 56474d512a..0fbb58a561 100644
--- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
@@ -885,7 +885,7 @@ CONFIG_TUN=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
CONFIG_IXP4XX_QMGR=m
-CONFIG_IXP4XX_NPE=m
+CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_NPE_FW_LOAD=y
CONFIG_IXP4XX_NPE_FW_MTD=y
CONFIG_IXP4XX_MAC=m
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
index ff90bcb3b3..b0ba8ba787 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "914"
+IXP4XX_KERNEL_SVN_REV = "915"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap1.inc
index ac7d398122..e2b168e454 100644
--- a/packages/linux/linux-omap1.inc
+++ b/packages/linux/linux-omap1.inc
@@ -7,8 +7,7 @@ COMPATIBLE_MACHINE = "omap5912osk"
inherit kernel
-KERNEL_IMAGETYPE = "vmlinux"
-KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}"
+KERNEL_IMAGETYPE = "uImage"
module_autoload_ohci-hcd_omap5912osk = "ohci-hcd"
@@ -22,15 +21,9 @@ do_configure_prepend() {
oe_runmake oldconfig
}
-
do_deploy() {
- if [ "${MACHINE}" == "omap5912osk" ]; then
- install -d ${DEPLOY_DIR_IMAGE}
- ${OBJCOPY} -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${S}/linux.bin
- gzip -f -9 ${S}/linux.bin
- mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${S}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}-${MACHINE}-${DATETIME}.bin
- rm ${S}/linux.bin.gz
- fi
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
}
do_deploy[dirs] = "${S}"
diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb
index 9238bbd1eb..85e8ea777f 100644
--- a/packages/openmoko-apps/openmoko-terminal_svn.bb
+++ b/packages/openmoko-apps/openmoko-terminal_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "gtkterm2"
-PV = "1.0.0+svn${SRCDATE}"
+PV = "1.0.0"
PR = "r1"
inherit openmoko
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 17bba22a72..672f5d8cb1 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "The OpenMoko Dialer"
SECTION = "openmoko/pim"
-DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer"
+RDEPENDS = "gst-meta-audio"
PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r2"
inherit openmoko2
diff --git a/packages/pkgconfig/pkgconfig-0.22/autofoo.patch b/packages/pkgconfig/pkgconfig-0.22/autofoo.patch
new file mode 100644
index 0000000000..97293cee1f
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig-0.22/autofoo.patch
@@ -0,0 +1,513 @@
+---
+ glib-1.2.8/acglib.m4 | 12 +-
+ glib-1.2.8/configure.in | 212 ++++++++++++++++++++++++++++++------------------
+ 2 files changed, 140 insertions(+), 84 deletions(-)
+
+Index: pkg-config-0.22/glib-1.2.8/acglib.m4
+===================================================================
+--- pkg-config-0.22.orig/glib-1.2.8/acglib.m4 2007-08-01 20:00:00.000000000 +0100
++++ pkg-config-0.22/glib-1.2.8/acglib.m4 2007-08-01 20:11:08.000000000 +0100
+@@ -10,7 +10,7 @@ $1
+ AC_DIVERT_POP()])])])
+
+ dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
+-AC_DEFUN(GLIB_IF_VAR_EQ,[
++AC_DEFUN([GLIB_IF_VAR_EQ],[
+ case "$[$1]" in
+ "[$2]"[)]
+ [$3]
+@@ -21,7 +21,7 @@ AC_DEFUN(GLIB_IF_VAR_EQ,[
+ esac
+ ])
+ dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION])
+-AC_DEFUN(GLIB_STR_CONTAINS,[
++AC_DEFUN([GLIB_STR_CONTAINS],[
+ case "[$1]" in
+ *"[$2]"*[)]
+ [$3]
+@@ -32,12 +32,12 @@ AC_DEFUN(GLIB_STR_CONTAINS,[
+ esac
+ ])
+ dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING)
+-AC_DEFUN(GLIB_ADD_TO_VAR,[
++AC_DEFUN([GLIB_ADD_TO_VAR],[
+ GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]")
+ ])
+
+ dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
+-AC_DEFUN(GLIB_SIZEOF,
++AC_DEFUN([GLIB_SIZEOF],
+ [changequote(<<, >>)dnl
+ dnl The name to #define.
+ define(<<AC_TYPE_NAME>>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl
+@@ -62,7 +62,7 @@ undefine([AC_CV_NAME])dnl
+ ])
+
+ dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER)
+-AC_DEFUN(GLIB_BYTE_CONTENTS,
++AC_DEFUN([GLIB_BYTE_CONTENTS],
+ [changequote(<<, >>)dnl
+ dnl The name to #define.
+ define(<<AC_TYPE_NAME>>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl
+@@ -92,7 +92,7 @@ undefine([AC_CV_NAME])dnl
+ ])
+
+ dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
+-AC_DEFUN(GLIB_SYSDEFS,
++AC_DEFUN([GLIB_SYSDEFS],
+ [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
+ glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'`
+ if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
+Index: pkg-config-0.22/glib-1.2.8/configure.in
+===================================================================
+--- pkg-config-0.22.orig/glib-1.2.8/configure.in 2007-08-01 18:03:34.000000000 +0100
++++ pkg-config-0.22/glib-1.2.8/configure.in 2007-05-23 11:47:53.000000000 +0100
+@@ -1,10 +1,11 @@
+ dnl ***********************************
+ dnl *** include special GLib macros ***
+ dnl ***********************************
+-builtin(include, acglib.m4)dnl
++dnl no need, just use aclocal -I . --CL
++dnl builtin(include, acglib.m4)dnl
+
+ # require autoconf 2.13
+-AC_PREREQ(2.13)
++AC_PREREQ(2.53)
+
+ # init autoconf (and check for presence of glist.c)
+ AC_INIT(glist.c)
+@@ -13,11 +14,48 @@ AC_INIT(glist.c)
+ cflags_set=${CFLAGS+set}
+
+ # we rewrite this file
++if test "x$cross_compiling" != "xyes"; then
+ rm -f glibconfig-sysdefs.h
++fi
++
++# config defines
++
++AH_TEMPLATE([ENABLE_MEM_CHECK],
++ [Define if enabling memory checking])
++AH_TEMPLATE([ENABLE_MEM_PROFILE], [])
++AH_TEMPLATE([GLIB_BINARY_AGE], [])
++AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], [])
++AH_TEMPLATE([GLIB_INTERFACE_AGE], [])
++AH_TEMPLATE([GLIB_MAJOR_VERSION], [])
++AH_TEMPLATE([GLIB_MINOR_VERSION], [])
++AH_TEMPLATE([GLIB_MICRO_VERSION], [])
++AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], [])
++AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], [])
++AH_TEMPLATE([G_HAVE_INLINE], [])
++AH_TEMPLATE([G_HAVE___INLINE], [])
++AH_TEMPLATE([G_HAVE___INLINE__], [])
++AH_TEMPLATE([G_THREAD_SOURCE], [])
++AH_TEMPLATE([G_VA_COPY], [])
++AH_TEMPLATE([G_VA_COPY_AS_ARRAY], [])
++AH_TEMPLATE([HAVE_BROKEN_WCTYPE], [])
++AH_TEMPLATE([HAVE_GETPWUID_R], [])
++AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], [])
++AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], [])
++AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], [])
++AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], [])
++AH_TEMPLATE([HAVE_WCHAR_H], [])
++AH_TEMPLATE([HAVE_WCTYPE_H], [])
++AH_TEMPLATE([NO_FD_SET], [])
++AH_TEMPLATE([NO_SYS_ERRLIST], [])
++AH_TEMPLATE([NO_SYS_SIGLIST], [])
++AH_TEMPLATE([NO_SYS_SIGLIST_DECL], [])
++AH_TEMPLATE([REALLOC_0_WORKS], [])
++
+
+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-GLIB_AC_DIVERT_BEFORE_HELP([
++#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
++#dnl
+ #
+ # The following version number definitions apply to GLib, GModule and GThread
+ # as a whole, so if changes occoured in any of them, they are all
+@@ -38,7 +76,7 @@ GLIB_INTERFACE_AGE=8
+ GLIB_BINARY_AGE=8
+ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
+ dnl
+-])
++#AC_DIVERT_POP()dnl
+
+ AC_SUBST(GLIB_MAJOR_VERSION)
+ AC_SUBST(GLIB_MINOR_VERSION)
+@@ -72,22 +110,20 @@ AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $
+ AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
+
+ dnl Initialize libtool
+-AC_PROG_LIBTOOL
++AM_PROG_LIBTOOL
+
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE
+
+-AC_CANONICAL_HOST
+-
+ dnl figure debugging default, prior to $ac_help setup
+ dnl
+-GLIB_AC_DIVERT_BEFORE_HELP([
++#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+ if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
+ debug_default=yes
+ else
+ debug_default=minimum
+ fi
+-]) dnl
++#AC_DIVERT_POP()dnl
+
+ dnl declare --enable-* args and collect ac_help strings
+ AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
+@@ -173,7 +209,9 @@ AC_TRY_RUN([#include <math.h>
+ CFLAGS=$glib_save_CFLAGS
+ AC_MSG_WARN(
+ [No ANSI prototypes found in library. (-std1 didn't work.)])
++ , AC_MSG_WARN([Skipping test due to crosscompilation])
+ )
++ , AC_MSG_WARN([Skipping test due to crosscompilation])
+ )
+ LIBS=$glib_save_LIBS
+
+@@ -315,7 +353,7 @@ AC_TRY_COMPILE([#include <sys/types.h>],
+ if test $gtk_ok = yes; then
+ AC_MSG_RESULT([yes, found in sys/types.h])
+ else
+- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
++ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
+ if test $gtk_ok = yes; then
+ AC_DEFINE(HAVE_SYS_SELECT_H)
+ AC_MSG_RESULT([yes, found in sys/select.h])
+@@ -388,7 +426,7 @@ AC_CACHE_VAL(glib_cv_sane_realloc,[
+ glib_cv_sane_realloc=no
+ ,)
+ ])
+-if test x$glib_cv_sane_realloc = xyes; then
++if test "x$glib_cv_sane_realloc" = "xyes"; then
+ AC_DEFINE(REALLOC_0_WORKS)
+ fi
+ AC_MSG_RESULT($glib_cv_sane_realloc)
+@@ -466,7 +504,8 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
+ ])
+ if test "x$glib_cv_va_copy" = "xyes"; then
+ AC_DEFINE(G_VA_COPY, va_copy)
+-else if test "x$glib_cv___va_copy" = "xyes"; then
++else
++if test "x$glib_cv___va_copy" = "xyes"; then
+ AC_DEFINE(G_VA_COPY, __va_copy)
+ fi
+ fi
+@@ -475,6 +514,7 @@ if test "x$glib_cv_va_val_copy" = "xno";
+ fi
+ AC_MSG_RESULT($glib_cv_va_val_copy)
+
++AC_MSG_WARN([hi mom])
+
+ dnl ***********************
+ dnl *** g_module checks ***
+@@ -485,23 +525,27 @@ dnl G_MODULE_IMPL= don't reset, so cmd-l
+ G_MODULE_NEED_USCORE=0
+ G_MODULE_HAVE_DLERROR=0
+ dnl *** dlopen() and dlsym() in system libraries
++AC_CHECK_FUNC(dlopen,[
++ AC_CHECK_FUNC(dlsym,[
++ G_MODULE_IMPL=G_MODULE_IMPL_DL
++ ],
++ )],
++)
+ if test -z "$G_MODULE_IMPL"; then
+- AC_CHECK_FUNC(dlopen,
+- [AC_CHECK_FUNC(dlsym,
++ AC_CHECK_FUNC(dlopen,[
++ AC_CHECK_FUNC(dlsym,[
+ G_MODULE_IMPL=G_MODULE_IMPL_DL
+- ,)]
+- ,)
+-
++ ])],
++ )
+ fi
+-
+ dnl *** dlopen() and dlsym() in libdl
+ if test -z "$G_MODULE_IMPL"; then
+- AC_CHECK_LIB(dl, dlopen,
+- [AC_CHECK_LIB(dl, dlsym,
++ AC_CHECK_LIB(dl, dlopen,[
++ AC_CHECK_LIB(dl, dlsym,[
+ G_MODULE_LIBS=-ldl
+ G_MODULE_IMPL=G_MODULE_IMPL_DL
+- ,)]
+- ,)
++ ])]
++ )
+ fi
+ dnl *** shl_load() in libdld (HP-UX)
+ if test -z "$G_MODULE_IMPL"; then
+@@ -580,6 +624,7 @@ AC_SUBST(G_MODULE_LDFLAGS)
+ AC_SUBST(G_MODULE_HAVE_DLERROR)
+ AC_SUBST(G_MODULE_NEED_USCORE)
+ AC_SUBST(GLIB_DEBUG_FLAGS)
++AC_MSG_WARN([hi mom])
+
+
+ dnl ***********************
+@@ -816,40 +861,50 @@ if test x"$have_threads" != xnone; then
+ fi
+ if test x"$have_threads" = xposix; then
+ LIBS="$LIBS $G_THREAD_LIBS"
+- AC_MSG_CHECKING(whether pthread_getspecific is posix like)
+ # PCThreads has pthread_getspecific(pthread_key_t, void **);
+- AC_TRY_COMPILE([#include <pthread.h>],
+- [pthread_getspecific(0,NULL);],
+- [AC_MSG_RESULT(no)],
+- [AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)])
+- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like)
++ AC_CACHE_CHECK([whether pthread_getspecific is posix like],
++ [glib_cv_sys_pthread_getspecific_posix],
++ AC_TRY_COMPILE([#include <pthread.h>],
++ [pthread_getspecific(0,NULL);],
++ [glib_cv_sys_pthread_getspecific_posix=no],
++ [glib_cv_sys_pthread_getspecific_posix=yes])
++ )
++ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then
++ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)
++ fi
+ # DCE Threads return 1 as success, posix 0. what a mess.
+- AC_TRY_RUN([#include <pthread.h>
+- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+- int main () {
+- return !pthread_mutex_trylock (&mutex); }],
+- [AC_MSG_RESULT(no)],
+- [AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)])
+- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
++ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like],
++ [glib_cv_sys_pthread_mutex_trylock_posix],
++ AC_TRY_RUN([#include <pthread.h>
++ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
++ int main () {
++ return !pthread_mutex_trylock (&mutex); }],
++ [glib_cv_sys_pthread_mutex_trylock_posix=no],
++ [glib_cv_sys_pthread_mutex_trylock_posix=yes])
++ )
++ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then
++ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)
++ fi
+ # DCE Threads return -1 as failure, posix ETIMEDOUT.
+- AC_TRY_RUN([#include <pthread.h>
+- #include <sys/time.h>
+- int main () {
+- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+- struct timeval tval;
+- struct timespec tspec;
+- gettimeofday (&tval, NULL);
+- tspec.tv_sec = tval.tv_sec;
+- tspec.tv_nsec = 0;
+- pthread_mutex_lock (&mutex);
+- return pthread_cond_timedwait (&cond,&mutex,&tspec)
+- != -1;}],
+- [AC_MSG_RESULT(no)],
+- [AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)])
++ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like],
++ [glib_cv_sys_pthread_cond_timedwait_posix],
++ AC_TRY_RUN([#include <pthread.h>
++ int main () {
++ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
++ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
++ struct timeval tval;
++ struct timespec tspec;
++ gettimeofday (&tval, NULL);
++ tspec.tv_sec = tval.tv_sec;
++ tspec.tv_nsec = 0;
++ return pthread_cond_timedwait (&cond,&mutex,&tspec)
++ != -1;}],
++ [glib_cv_sys_pthread_cond_timedwait_posix=no],
++ [glib_cv_sys_pthread_cond_timedwait_posix=yes])
++ )
++ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then
++ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)
++ fi
+ fi
+ LIBS="$glib_save_LIBS"
+ CFLAGS="$glib_save_CFLAGS"
+@@ -893,13 +948,14 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
+ dnl ****************************************
+ dnl *** GLib POLL* compatibility defines ***
+ dnl ****************************************
++if test x"$cross_compiling" != xyes; then
+ GLIB_SYSDEFS(
+ [#include <sys/types.h>
+ #include <sys/poll.h>],
+ POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
+ glibconfig-sysdefs.h,
+ =)
+-
++fi
+
+ dnl ******************************
+ dnl *** output the whole stuff ***
+@@ -956,7 +1012,7 @@ _______EOF
+ echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
+ fi
+
+- cat >> $outfile <<_______EOF
++ cat >> $outfile <<EOF
+
+ #define G_MINFLOAT $glib_mf
+ #define G_MAXFLOAT $glib_Mf
+@@ -969,60 +1025,60 @@ _______EOF
+ #define G_MINLONG $glib_ml
+ #define G_MAXLONG $glib_Ml
+
+-_______EOF
++EOF
+
+
+ ### this should always be true in a modern C/C++ compiler
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ typedef signed char gint8;
+ typedef unsigned char guint8;
+-_______EOF
++EOF
+
+
+ if test -n "$gint16"; then
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ typedef signed $gint16 gint16;
+ typedef unsigned $gint16 guint16;
+-_______EOF
++EOF
+ fi
+
+
+ if test -n "$gint32"; then
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ typedef signed $gint32 gint32;
+ typedef unsigned $gint32 guint32;
+-_______EOF
++EOF
+ fi
+
+
+ if test -n "$gint64"; then
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ ${glib_warning_guard}#define G_HAVE_GINT64 1
+
+ ${glib_extension}typedef signed $gint64 gint64;
+ ${glib_extension}typedef unsigned $gint64 guint64;
+
+ #define G_GINT64_CONSTANT(val) $gint64_constant
+-_______EOF
++EOF
+ fi
+
+
+ if test -z "$glib_unknown_void_p"; then
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+
+ #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
+ #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
+
+ #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
+ #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
+-_______EOF
++EOF
+ else
+ echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
+ fi
+
+
+
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ $glib_atexit
+ $glib_memmove
+ $glib_defines
+@@ -1034,11 +1090,11 @@ $glib_vacopy
+ #else /* !__cplusplus */
+ $glib_inline
+ #endif /* !__cplusplus */
+-_______EOF
++EOF
+
+ echo >>$outfile
+ if test x$g_mutex_has_default = xyes; then
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ $g_enable_threads_def G_THREADS_ENABLED
+ #define G_THREADS_IMPL_$g_threads_impl_def
+ typedef struct _GStaticMutex GStaticMutex;
+@@ -1056,15 +1112,15 @@ struct _GStaticMutex
+ #define g_static_mutex_get_mutex(mutex) \
+ (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
+ g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
+-_______EOF
++EOF
+ else
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ $g_enable_threads_def G_THREADS_ENABLED
+ #define G_THREADS_IMPL_$g_threads_impl_def
+ typedef struct _GMutex* GStaticMutex;
+ #define G_STATIC_MUTEX_INIT NULL
+ #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
+-_______EOF
++EOF
+ fi
+
+ echo >>$outfile
+@@ -1073,15 +1129,15 @@ _______EOF
+ g_bit_sizes="$g_bit_sizes 64"
+ fi
+ for bits in $g_bit_sizes; do
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
+ #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
+ #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
+ #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
+-_______EOF
++EOF
+ done
+
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+ #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
+ #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
+ #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
+@@ -1092,14 +1148,14 @@ _______EOF
+ #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
+ #define G_BYTE_ORDER $g_byte_order
+
+-_______EOF
++EOF
+
+ if test -r glibconfig-sysdefs.h; then
+ cat glibconfig-sysdefs.h >>$outfile
+ fi
+
+
+- cat >>$outfile <<_______EOF
++ cat >>$outfile <<EOF
+
+ $glib_wc
+
+@@ -1109,7 +1165,7 @@ $glib_wc
+ #endif /* __cplusplus */
+
+ #endif /* GLIBCONFIG_H */
+-_______EOF
++EOF
+
+
+ if cmp -s $outfile glibconfig.h; then
diff --git a/packages/pkgconfig/pkgconfig-native_0.22.bb b/packages/pkgconfig/pkgconfig-native_0.22.bb
index 507a74b7d9..4481656d7a 100644
--- a/packages/pkgconfig/pkgconfig-native_0.22.bb
+++ b/packages/pkgconfig/pkgconfig-native_0.22.bb
@@ -1,7 +1,16 @@
SECTION = "console/utils"
-require pkgconfig_${PV}.bb
+require pkgconfig.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+DEFAULT_PREFERENCE = "-1"
+
S = "${WORKDIR}/pkg-config-${PV}/"
inherit native
DEPENDS = ""
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc
new file mode 100644
index 0000000000..47c077a8d3
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig.inc
@@ -0,0 +1,24 @@
+SECTION = "console/utils"
+DESCRIPTION = "pkg-config is a system for managing library \
+compile/link flags that works with automake and autoconf. \
+It replaces the ubiquitous *-config scripts you may have \
+seen with a single tool."
+HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+ file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+
+inherit autotools
+
+acpaths = "-I ."
+do_configure_prepend () {
+ install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+}
+
+do_stage_prepend() {
+ install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+}
diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb
index 68d6a9917d..31fc7820fe 100644
--- a/packages/pkgconfig/pkgconfig_0.15.0.bb
+++ b/packages/pkgconfig/pkgconfig_0.15.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV
file://pkg.m4 \
file://glibconfig-sysdefs.h"
-inherit autotools
+inherit autotools
acpaths = "-I ."
do_configure_prepend () {
diff --git a/packages/pkgconfig/pkgconfig_0.22.bb b/packages/pkgconfig/pkgconfig_0.22.bb
index f634a87940..599e1c815e 100644
--- a/packages/pkgconfig/pkgconfig_0.22.bb
+++ b/packages/pkgconfig/pkgconfig_0.22.bb
@@ -1,30 +1,3 @@
-SECTION = "console/utils"
-DESCRIPTION = "pkg-config is a system for managing library \
-compile/link flags that works with automake and autoconf. \
-It replaces the ubiquitous *-config scripts you may have \
-seen with a single tool."
-HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
-LICENSE = "GPL"
-PR = "r0"
+require pkgconfig.inc
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
- file://glibconfig-sysdefs.h"
-
-S = "${WORKDIR}/pkg-config-${PV}/"
-
-inherit autotools
-
-acpaths = "-I ."
-do_configure () {
- install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_stage_prepend() {
- install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
-
-}
+SRC_URI += "file://autofoo.patch;patch=1"
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index d2281bca17..21f1b551f5 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -92,6 +92,9 @@ kernel-module-pata-artop \
# Add modules required for Network support
SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-mii \
+kernel-module-ixp4xx-mac \
+kernel-module-ixp4xx-qmgr \
kernel-module-via-velocity \
"
diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
deleted file mode 100644
index 5805a0fe04..0000000000
--- a/packages/xorg-app/appres_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "The appres program prints the resources seen by an application."
-
-DEPENDS += " virtual/libx11 libxt"
-
diff --git a/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index 7b6aa37311..0000000000
--- a/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Native bdftopdf utility"
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
-
-S="${WORKDIR}/bdftopcf-${PV}"
-
-DEPENDS = "libxfont-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
deleted file mode 100644
index d9f37daf1a..0000000000
--- a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "bdftopcf is a font compiler for the X server and font server."
-
-DEPENDS += " libxfont"
-
diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
deleted file mode 100644
index 5a64332d48..0000000000
--- a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index c933d4f718..0000000000
--- a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 4d9a7f53de..0000000000
--- a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 281a33c4bd..0000000000
--- a/packages/xorg-app/editres_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxt libxmu libxaw"
-
diff --git a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
deleted file mode 100644
index fb84802ca6..0000000000
--- a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xproto freetype libfontenc"
-
diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
deleted file mode 100644
index 0257648e20..0000000000
--- a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 0257648e20..0000000000
--- a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 0257648e20..0000000000
--- a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libfs"
-
diff --git a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
deleted file mode 100644
index 5f94b334be..0000000000
--- a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xproto libice"
-
diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/ico_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index b9aa49f4ab..0000000000
--- a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 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/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
deleted file mode 100644
index 61fb362e23..0000000000
--- a/packages/xorg-app/listres_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index dd599b3ad7..0000000000
--- a/packages/xorg-app/luit_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d2974045c2..0000000000
--- a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxfont libfs libfontenc"
-
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
deleted file mode 100644
index 7bfea3e84c..0000000000
--- a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "X mkfontdir app"
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-DEPENDS = "util-macros-native mkfontscale-native"
-PR = "r1"
-
-S = "${WORKDIR}/mkfontdir-${PV}"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontdir-${PV}.tar.bz2"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
deleted file mode 100644
index ac6d19fd95..0000000000
--- a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "X mkfontdir app"
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-DEPENDS = "util-macros-native mkfontscale-native"
-PR = "r1"
-
-S = "${WORKDIR}/mkfontdir-${PV}"
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
deleted file mode 100644
index d721fd07b7..0000000000
--- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-
-RDEPENDS += "mkfontscale"
-
diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
deleted file mode 100644
index d721fd07b7..0000000000
--- a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-
-RDEPENDS += "mkfontscale"
-
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
deleted file mode 100644
index 5bbab6a5fd..0000000000
--- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "X mkfontscale app"
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-S="${WORKDIR}/mkfontscale-${PV}"
-
-DEPENDS = "libx11-native libfontenc-native freetype-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
deleted file mode 100644
index 2f5eab7d63..0000000000
--- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index f275cc94d4..0000000000
--- a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index ea4a1ad78d..0000000000
--- a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 1c46d69a0b..0000000000
--- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxt"
-
diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
deleted file mode 100644
index 59dd8abd27..0000000000
--- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-PR = "r1"
-
-#DESCRIPTION = ""
-
-DEPENDS += " xproto util-macros"
-
-FILES_${PN} += "${datadir}/X11"
-
-
diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 00bfde0620..0000000000
--- a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 8001d661e7..0000000000
--- a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 8001d661e7..0000000000
--- a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxkbfile virtual/libx11"
-
diff --git a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
deleted file mode 100644
index 165202b2da..0000000000
--- a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libfs"
-
diff --git a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
deleted file mode 100644
index 843541dc77..0000000000
--- a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxt libxmu"
-
diff --git a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
deleted file mode 100644
index 843541dc77..0000000000
--- a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxt libxmu"
-
diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
deleted file mode 100644
index 3cbab36e9b..0000000000
--- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "tiny window manager"
-
-DEPENDS += " virtual/libx11 libxext libxt libxmu"
-
-ALTERNATIVE_PATH = "${bindir}/twm"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "1"
diff --git a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
deleted file mode 100644
index 50c6a97949..0000000000
--- a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxt"
-
diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
deleted file mode 100644
index 905f3cdced..0000000000
--- a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 8581abd43c..0000000000
--- a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index b891ff90ef..0000000000
--- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxau libxext libxmu"
-
diff --git a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
deleted file mode 100644
index 5e21a9e590..0000000000
--- a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw xbitmaps libxext"
-
diff --git a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
deleted file mode 100644
index 7ad19bb1bb..0000000000
--- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 7ad19bb1bb..0000000000
--- a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11"
-
diff --git a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
deleted file mode 100644
index 50c6a97949..0000000000
--- a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxt"
-
diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
deleted file mode 100644
index 2dbb5b76ce..0000000000
--- a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 2dbb5b76ce..0000000000
--- a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxcursor libpng"
-
diff --git a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
deleted file mode 100644
index 37d37250df..0000000000
--- a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxp libxprintutil libxp libxau libxext"
-
diff --git a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
deleted file mode 100644
index d2c87b6a57..0000000000
--- a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X display manager"
-
-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
deleted file mode 100644
index 955fd33732..0000000000
--- a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X display manager"
-
-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
deleted file mode 100644
index d212bc1422..0000000000
--- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X display information utility"
-LICENSE = "MIT"
-
-DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
-
-SRC_URI += "file://disable-xkb.patch;patch=1"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
deleted file mode 100644
index 61e5837b9e..0000000000
--- a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 61e5837b9e..0000000000
--- a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 glproto mesa"
-
diff --git a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
deleted file mode 100644
index c4008cc579..0000000000
--- a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxprintutil libxp libxt"
-
diff --git a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
deleted file mode 100644
index c4008cc579..0000000000
--- a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxprintutil libxp libxt"
-
diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
deleted file mode 100644
index 1969eb3c07..0000000000
--- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-
-DEPENDS += " virtual/libx11"
-
diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
deleted file mode 100644
index de9861c60e..0000000000
--- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 6a5f12d484..0000000000
--- a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu"
-
diff --git a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
deleted file mode 100644
index 1751f4bdf7..0000000000
--- a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw freetype fontconfig libxft libxt"
-
diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
deleted file mode 100644
index bf8ad7904b..0000000000
--- a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libice libxt xproxymngproto"
-
diff --git a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9567be7a12..0000000000
--- a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X fontserver"
-
-DEPENDS += " libfs libxfont xtrans"
-
diff --git a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
deleted file mode 100644
index 9567be7a12..0000000000
--- a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X fontserver"
-
-DEPENDS += " libfs libxfont xtrans"
-
diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
deleted file mode 100644
index 0257648e20..0000000000
--- a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index b9dc35b367..0000000000
--- a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 7549d9902f..0000000000
--- a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxxf86vm"
-
diff --git a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
deleted file mode 100644
index e997ffc6a6..0000000000
--- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Server access control program for X"
-LICENSE = "MIT"
-
-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
deleted file mode 100644
index e997ffc6a6..0000000000
--- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Server access control program for X"
-LICENSE = "MIT"
-
-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
deleted file mode 100644
index 00bfde0620..0000000000
--- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 025a578370..0000000000
--- a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index f6b9503cd8..0000000000
--- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-
-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
deleted file mode 100644
index f6b9503cd8..0000000000
--- a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-
-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
deleted file mode 100644
index 8001d661e7..0000000000
--- a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 8001d661e7..0000000000
--- a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 8001d661e7..0000000000
--- a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 15ce7e6011..0000000000
--- a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 905f3cdced..0000000000
--- a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxmu"
-
diff --git a/packages/xorg-app/xload_X11R7.0-1.0.1.bb b/packages/xorg-app/xload_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xload_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
deleted file mode 100644
index b328683361..0000000000
--- a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
-
diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
deleted file mode 100644
index 905f3cdced..0000000000
--- a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 905f3cdced..0000000000
--- a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11"
-
diff --git a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xman_X11R7.0-1.0.1.bb b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
deleted file mode 100644
index 7559ace10c..0000000000
--- a/packages/xorg-app/xman_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS = " man"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/packages/xorg-app/xman_X11R7.1-1.0.2.bb b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
deleted file mode 100644
index 7559ace10c..0000000000
--- a/packages/xorg-app/xman_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS = " man"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
deleted file mode 100644
index da0a1896b3..0000000000
--- a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "xmessage displays a message or query in a window."
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
deleted file mode 100644
index 9ef50b8ffd..0000000000
--- a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
deleted file mode 100644
index 856aae8e6c..0000000000
--- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-
-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
deleted file mode 100644
index da12303b23..0000000000
--- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-
-DEPENDS += " virtual/libx11"
-
diff --git a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
deleted file mode 100644
index 88b90afb05..0000000000
--- a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxprintutil libxp libxt"
-
diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
deleted file mode 100644
index 2153dfd459..0000000000
--- a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 79f4194c48..0000000000
--- a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 2dd7807ec5..0000000000
--- a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 0718958efe..0000000000
--- a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 2dd7807ec5..0000000000
--- a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxmu virtual/libx11"
-
diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
deleted file mode 100644
index 4b878cc32e..0000000000
--- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE= "BSD-X"
-
-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
deleted file mode 100644
index 4b878cc32e..0000000000
--- a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE= "BSD-X"
-
-DEPENDS += " libxrandr libxrender virtual/libx11"
-
diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
deleted file mode 100644
index 65f08f2bb6..0000000000
--- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-
-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
deleted file mode 100644
index 24a5ac9208..0000000000
--- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-
-DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d956f3aecd..0000000000
--- a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau"
-
diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
deleted file mode 100644
index 72c315c6a1..0000000000
--- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-
-DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
-
-SRC_URI += "file://disable-xkb.patch;patch=1"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--disable-xkb"
-
diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
deleted file mode 100644
index 72c315c6a1..0000000000
--- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-
-DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
-
-SRC_URI += "file://disable-xkb.patch;patch=1"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--disable-xkb"
-
diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
deleted file mode 100644
index d473975d5e..0000000000
--- a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d473975d5e..0000000000
--- a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d5ddbadb49..0000000000
--- a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxmu virtual/libx11 xbitmaps"
-
diff --git a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
deleted file mode 100644
index 6c22106e5a..0000000000
--- a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = "X Session Manager"
-
-DEPENDS += " libxaw libxt"
-
diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
deleted file mode 100644
index 2dd7807ec5..0000000000
--- a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxmu virtual/libx11"
-
diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
deleted file mode 100644
index 91933be884..0000000000
--- a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 91933be884..0000000000
--- a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxtrap"
-
diff --git a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
deleted file mode 100644
index 66fa7fff7f..0000000000
--- a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxxf86vm libxt"
-
diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
deleted file mode 100644
index e0fe5605bc..0000000000
--- a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 2dd7807ec5..0000000000
--- a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 71fb6f0ca4..0000000000
--- a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 71fb6f0ca4..0000000000
--- a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index d584483e44..0000000000
--- a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11"
-
diff --git a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
deleted file mode 100644
index 502b3c1419..0000000000
--- a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-data-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb
deleted file mode 100644
index 8d765a1bb7..0000000000
--- a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-data-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxcursor"
-
diff --git a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
deleted file mode 100644
index dc02f163f6..0000000000
--- a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-data-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-RDEPENDS = "xkbcomp"
-
-FILES_${PN} += " /usr/share/X11/xkb"
-
diff --git a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb
deleted file mode 100644
index 069f25ad10..0000000000
--- a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-doc-common.inc
-
-DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
-source tree."
-
-DEPENDS += " intltool"
-
-FILES_${PN} += " /usr/share/X11/doc"
-
diff --git a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb b/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb
deleted file mode 100644
index 069f25ad10..0000000000
--- a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-doc-common.inc
-
-DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
-source tree."
-
-DEPENDS += " intltool"
-
-FILES_${PN} += " /usr/share/X11/doc"
-
diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb
deleted file mode 100644
index 45dd0d692d..0000000000
--- a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-doc-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb
deleted file mode 100644
index 45dd0d692d..0000000000
--- a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-doc-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb b/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb b/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb
deleted file mode 100644
index 47acb760d2..0000000000
--- a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " kbproto"
-
diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb
deleted file mode 100644
index 47acb760d2..0000000000
--- a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " kbproto"
-
diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb
deleted file mode 100644
index 47acb760d2..0000000000
--- a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " kbproto"
-
diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb
deleted file mode 100644
index a76eec5e1f..0000000000
--- a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-DESCRIPTION = "Mouse Support in X11"
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb
deleted file mode 100644
index a76eec5e1f..0000000000
--- a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-DESCRIPTION = "Mouse Support in X11"
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb b/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb
deleted file mode 100644
index 7942a3ab2e..0000000000
--- a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-input.inc
-
-DESCRIPTION = "The VMMouse driver enables support for the special VMMouse protocol \
-that is provided by VMware virtual machines to give absolute pointer \
-positioning. "
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb
deleted file mode 100644
index ee92f6c162..0000000000
--- a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb
deleted file mode 100644
index 63e473c720..0000000000
--- a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
-
-DEPENDS += " xf86rushproto"
-
diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb
deleted file mode 100644
index 63e473c720..0000000000
--- a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
-
-DEPENDS += " xf86rushproto"
-
diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb b/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb b/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb b/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb b/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb
deleted file mode 100644
index c811bf888a..0000000000
--- a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb b/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb
deleted file mode 100644
index c811bf888a..0000000000
--- a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index 92216d1e4a..0000000000
--- a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb
deleted file mode 100644
index 92216d1e4a..0000000000
--- a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb
deleted file mode 100644
index 92216d1e4a..0000000000
--- a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb
deleted file mode 100644
index 92216d1e4a..0000000000
--- a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb
deleted file mode 100644
index 4b57f17b9e..0000000000
--- a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb
deleted file mode 100644
index 4b57f17b9e..0000000000
--- a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb
deleted file mode 100644
index 3b867c9c56..0000000000
--- a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "Number Nine I128 for X11"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb
deleted file mode 100644
index 3b867c9c56..0000000000
--- a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "Number Nine I128 for X11"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index 4935a006cd..0000000000
--- a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "I740 for X11"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb
deleted file mode 100644
index 4935a006cd..0000000000
--- a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "I740 for X11"
-
-#DEPENDS += " "
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
deleted file mode 100644
index 8dc577aeaa..0000000000
--- a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "I810 for X11"
-
-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
deleted file mode 100644
index 8dc577aeaa..0000000000
--- a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "I810 for X11"
-
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb b/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb
deleted file mode 100644
index a66e410315..0000000000
--- a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb
deleted file mode 100644
index a66e410315..0000000000
--- a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index e5f997e0fa..0000000000
--- a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb
deleted file mode 100644
index 4c2a45f05e..0000000000
--- a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
-
-DEPENDS += " xf86dgaproto"
-
diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb b/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb
deleted file mode 100644
index 956a2021c1..0000000000
--- a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb
deleted file mode 100644
index 956a2021c1..0000000000
--- a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb
deleted file mode 100644
index 1dad571e13..0000000000
--- a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
-
diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb
deleted file mode 100644
index 1dad571e13..0000000000
--- a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
-
diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb
deleted file mode 100644
index 84edd97fd3..0000000000
--- a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb
deleted file mode 100644
index 84edd97fd3..0000000000
--- a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb b/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb b/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb b/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb
deleted file mode 100644
index d05a26bddd..0000000000
--- a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb b/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb
deleted file mode 100644
index f898676111..0000000000
--- a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb b/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb
deleted file mode 100644
index 2cd161cec2..0000000000
--- a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb b/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb
deleted file mode 100644
index 2cd161cec2..0000000000
--- a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb
deleted file mode 100644
index 9e662ff6bb..0000000000
--- a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xineramaproto xf86miscproto"
-
diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb
deleted file mode 100644
index 9e662ff6bb..0000000000
--- a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xineramaproto xf86miscproto"
-
diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index f005c731ef..0000000000
--- a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb
deleted file mode 100644
index d05a26bddd..0000000000
--- a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto"
-
diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb
deleted file mode 100644
index f898676111..0000000000
--- a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb
deleted file mode 100644
index f898676111..0000000000
--- a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb
deleted file mode 100644
index f898676111..0000000000
--- a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index 3ede51328b..0000000000
--- a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "DEC 21030 X11 driver"
-
-DEPENDS += " xf86dgaproto"
-
diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb
deleted file mode 100644
index 3ede51328b..0000000000
--- a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "DEC 21030 X11 driver"
-
-DEPENDS += " xf86dgaproto"
-
diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb b/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb
deleted file mode 100644
index 92216d1e4a..0000000000
--- a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb
deleted file mode 100644
index 92216d1e4a..0000000000
--- a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb
deleted file mode 100644
index ae5f660b08..0000000000
--- a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "Video 4 Linux adaptor driver for X11"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb
deleted file mode 100644
index ae5f660b08..0000000000
--- a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "Video 4 Linux adaptor driver for X11"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb
deleted file mode 100644
index c04d4b4346..0000000000
--- a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-
-SRC_URI += "file://fix-includepath.patch;patch=1"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb b/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb
deleted file mode 100644
index a87a5f7a56..0000000000
--- a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb b/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb
deleted file mode 100644
index e202a0d54e..0000000000
--- a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto libxvmc"
diff --git a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb b/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb
deleted file mode 100644
index e202a0d54e..0000000000
--- a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " drm xf86driproto libxvmc"
diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb
deleted file mode 100644
index c8898e462b..0000000000
--- a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver for VMware SVGA Device"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb
deleted file mode 100644
index c8898e462b..0000000000
--- a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver for VMware SVGA Device"
-
-#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index db2545c9c3..0000000000
--- a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb
deleted file mode 100644
index db2545c9c3..0000000000
--- a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-driver-video.inc
-
-DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
-
-DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb
deleted file mode 100644
index f25d150d61..0000000000
--- a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS = "mkfontscale-native"
-RDEPENDS = ""
-
diff --git a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index 94e4a48083..0000000000
--- a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb
deleted file mode 100644
index 536a3f6e60..0000000000
--- a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Adobe typeface software"
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb
deleted file mode 100644
index cd9773cc61..0000000000
--- a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Adobe typeface software"
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb
deleted file mode 100644
index cd9773cc61..0000000000
--- a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Adobe typeface software"
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
deleted file mode 100644
index 12f8c63088..0000000000
--- a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "X font aliases."
-
-DEPENDS = "virtual/xserver font-util"
-RDEPENDS = "encodings font-util"
-
diff --git a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index 8b8f914f4f..0000000000
--- a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \
-of the Arabic characters available in Unicode."
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index 82d6f5350e..0000000000
--- a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
--EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
diff --git a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb
deleted file mode 100644
index 5ab5967ab6..0000000000
--- a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "These fonts are designed for the display of Syriac text."
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index 216c123346..0000000000
--- a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
-the glyphs needed for Unicode text."
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index e12d658230..0000000000
--- a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X font utils."
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
-
-S="${WORKDIR}/font-util-${PV}"
-
-DEPENDS = "bdftopcf-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
deleted file mode 100644
index 86e7b62b63..0000000000
--- a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X font utils."
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
-
-S="${WORKDIR}/font-util-${PV}"
-
-DEPENDS = "bdftopcf-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
deleted file mode 100644
index fea5089e2d..0000000000
--- a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "X font utils."
-
-DEPENDS = "encodings"
-RDEPENDS = "encodings"
-
diff --git a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb
deleted file mode 100644
index 9074beb55a..0000000000
--- a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "X font utils."
-
-DEPENDS = "encodings"
-RDEPENDS = "mkfontdir mkfontscale encodings"
-
-PR="r1"
-
diff --git a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb
deleted file mode 100644
index e929e911ec..0000000000
--- a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-font-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
deleted file mode 100644
index b30098c850..0000000000
--- a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "x11/base"
-require libx11_${PV}.bb
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
- file://fix-disable-xlocale.diff;patch=1 \
- file://fix-utf8-wrong-define.patch;patch=1"
-
-#do_stage_append () {
-# rm -f ${STAGING_INCDIR}/X11/XKBlib.h
-#}
diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
deleted file mode 100644
index 52e01dde75..0000000000
--- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "x11/base"
-require libx11_${PV}.bb
-
-EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-PR = "r4"
-
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
- file://fix-disable-xlocale.diff;patch=1 \
- file://fix-utf8-wrong-define.patch;patch=1 \
- file://xim.patch;patch=1 \
- file://xchar2b.patch;patch=1"
diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
deleted file mode 100644
index 28abffa735..0000000000
--- a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index a612982a95..0000000000
--- a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index a612982a95..0000000000
--- a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
diff --git a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
deleted file mode 100644
index f410b5d94e..0000000000
--- a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X fontenc library (used by libxfont)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "zlib-native xproto-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2"
-S = "${WORKDIR}/libfontenc-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
deleted file mode 100644
index 5a3febbca8..0000000000
--- a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X libfontenc library (used by libxfont)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "zlib-native xproto-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2"
-S = "${WORKDIR}/libfontenc-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
deleted file mode 100644
index a4badc38ce..0000000000
--- a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X fontenc library (used by libxfont)."
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-
-DEPENDS += " zlib xproto"
-
diff --git a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
deleted file mode 100644
index a4badc38ce..0000000000
--- a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X fontenc library (used by libxfont)."
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-
-DEPENDS += " zlib xproto"
-
diff --git a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
deleted file mode 100644
index 5c07ce682c..0000000000
--- a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = " "
-
-DEPENDS += " xproto fontsproto xtrans"
-
-XORG_PN = "libFS"
-
diff --git a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
deleted file mode 100644
index da40983162..0000000000
--- a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 ICE library"
-PRIORITY = "optional"
-
-DEPENDS += " xproto xtrans"
-PROVIDES = "ice"
-
-XORG_PN = "libICE"
-
diff --git a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
deleted file mode 100644
index da40983162..0000000000
--- a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 ICE library"
-PRIORITY = "optional"
-
-DEPENDS += " xproto xtrans"
-PROVIDES = "ice"
-
-XORG_PN = "libICE"
-
diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
deleted file mode 100644
index 57b2987968..0000000000
--- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-SRC_URI += "file://mkg3states-1.0.0.patch;patch=0"
-
-DESCRIPTION = "XFIXES Extension"
-
-DEPENDS += " xextproto xproto zlib"
-PROVIDES = "lbxutil"
diff --git a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
deleted file mode 100644
index 1b8660dda6..0000000000
--- a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-export CC_FOR_BUILD = "gcc"
-
-SRC_URI += "file://mkg3states.patch;patch=1"
-
-DESCRIPTION = "XFIXES Extension"
-
-DEPENDS += " xextproto xproto zlib"
-PROVIDES = "lbxutil"
diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
deleted file mode 100644
index 2a380a65f6..0000000000
--- a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11"
-
-XORG_PN = "liboldX"
-
diff --git a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
deleted file mode 100644
index 383e29e743..0000000000
--- a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Session management library"
-PRIORITY = "optional"
-
-DEPENDS += " libice xproto xtrans"
-
-XORG_PN = "libSM"
-
diff --git a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
deleted file mode 100644
index 383e29e743..0000000000
--- a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Session management library"
-PRIORITY = "optional"
-
-DEPENDS += " libice xproto xtrans"
-
-XORG_PN = "libSM"
-
diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
deleted file mode 100644
index 90b8aeca49..0000000000
--- a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxext xextproto windowswmproto"
-
-XORG_PN = "libWindowsWM"
-
diff --git a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index f1dfd65c98..0000000000
--- a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "x11-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit native autotools pkgconfig
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
-}
diff --git a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
deleted file mode 100644
index 3c30890ac8..0000000000
--- a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "x11-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2"
-SRC_URI += "file://makekeys.diff;patch=1"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit autotools pkgconfig native
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
-}
-
-
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 023f15cef3..7ac5b58345 100644
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -1,13 +1,12 @@
require xorg-lib-common.inc
PE = "1"
-PR = "r2"
+PR = "r4"
DESCRIPTION = "Base X libs."
DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxcb libxdmcp xf86bigfontproto kbproto inputproto"
PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
XORG_PN = "libX11"
@@ -20,9 +19,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
do_compile() {
- (
- unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
- ) || exit 1
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
+
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index bab2277fd0..e6b0ec5d8b 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,17 +5,19 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto"
PROVIDES = "virtual/libx11"
PE = "1"
+PR = "r1"
XORG_PN = "libX11"
EXTRA_OECONF += "--without-xcb"
do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
deleted file mode 100644
index b1c26775e3..0000000000
--- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-
-DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
- libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-
-XORG_PN = "libX11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- ) || exit 1
- oe_runmake
-}
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
deleted file mode 100644
index b7fb686a60..0000000000
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require xorg-lib-common.inc
-
-
-PR = "r4"
-
-DESCRIPTION = "Base X libs."
-SRC_URI += "file://makekeys.diff;patch=1"
-SRC_URI += " file://ruutf8.patch;patch=1"
-
-DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
- libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-
-XORG_PN = "libX11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-
-do_compile() {
- (
- unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
- ) || exit 1
- oe_runmake
-}
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index f2929624e8..422afc92e0 100644
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -5,8 +5,7 @@ SECTION = "x11/libs"
LICENSE = "XFree86"
DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-PR = "r1"
+PR = "r3"
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
@@ -18,14 +17,17 @@ inherit autotools pkgconfig
EXTRA_OECONF="--enable-malloc0returnsnull"
+
do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
+
do_stage() {
autotools_stage_all
}
diff --git a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index 0e28057d82..0000000000
--- a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
-S = "${WORKDIR}/libXau-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
deleted file mode 100644
index 617ee7e6b3..0000000000
--- a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2"
-S = "${WORKDIR}/libXau-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
deleted file mode 100644
index 5ad793c9b8..0000000000
--- a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "A Sample Authorization Protocol for X"
-PRIORITY = "optional"
-
-DEPENDS += " xproto"
-PROVIDES = "xau"
-
-XORG_PN = "libXau"
-
diff --git a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
deleted file mode 100644
index 5ad793c9b8..0000000000
--- a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "A Sample Authorization Protocol for X"
-PRIORITY = "optional"
-
-DEPENDS += " xproto"
-PROVIDES = "xau"
-
-XORG_PN = "libXau"
-
diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
deleted file mode 100644
index 3961042a2d..0000000000
--- a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xaw is the X Athena Widget Set."
-
-DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PROVIDES = "xaw"
-
-XORG_PN = "libXaw"
-
-do_stage () {
- autotools_stage_all
- ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
- ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
- ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
-}
diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
deleted file mode 100644
index ff240607cb..0000000000
--- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xaw is the X Athena Widget Set."
-DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PROVIDES = "xaw"
-PR = "r1"
-
-XORG_PN = "libXaw"
-
-do_stage () {
- autotools_stage_all
- ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
- ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
- ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
-}
-
-PACKAGES =+ "libxaw6 libxaw7 libxaw8"
-
-FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
-FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
-FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
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
deleted file mode 100644
index 4cab60a531..0000000000
--- a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Composite extension library."
-LICENSE= "BSD-X"
-
-DEPENDS += " compositeproto virtual/libx11 libxfixes"
-PROVIDES = "xcomposite"
-
-XORG_PN = "libXcomposite"
-
-SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
deleted file mode 100644
index 70d0917887..0000000000
--- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Composite extension library."
-LICENSE= "BSD-X"
-
-DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
-PROVIDES = "xcomposite"
-
-XORG_PN = "libXcomposite"
-
-SRC_URI += " file://change-include-order.patch;patch=1"
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
deleted file mode 100644
index 2b13c4213c..0000000000
--- a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Cursor library"
-LICENSE= "BSD-X"
-
-DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
-
-XORG_PN = "libXcursor"
-
-FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
deleted file mode 100644
index 2b13c4213c..0000000000
--- a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Cursor library"
-LICENSE= "BSD-X"
-
-DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
-
-XORG_PN = "libXcursor"
-
-FILES_${PN} += "${libdir}/libXcursor.so"
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
deleted file mode 100644
index 6bb9c39f60..0000000000
--- a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Damage extension library."
-LICENSE= "BSD-X"
-
-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
deleted file mode 100644
index 6bb9c39f60..0000000000
--- a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Damage extension library."
-LICENSE= "BSD-X"
-
-DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
-PROVIDES = "xdamage"
-
-XORG_PN = "libXdamage"
-
diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index d34088a255..0000000000
--- a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdmcp-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
deleted file mode 100644
index 12b5bbe905..0000000000
--- a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXdmcp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdmcp-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
deleted file mode 100644
index c0139498c5..0000000000
--- a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Display Manager Control Protocol library."
-PRIORITY = "optional"
-
-DEPENDS += " xproto"
-PROVIDES = "xdmcp"
-
-XORG_PN = "libXdmcp"
-
diff --git a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
deleted file mode 100644
index c0139498c5..0000000000
--- a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Display Manager Control Protocol library."
-PRIORITY = "optional"
-
-DEPENDS += " xproto"
-PROVIDES = "xdmcp"
-
-XORG_PN = "libXdmcp"
-
diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
deleted file mode 100644
index 4c3a134633..0000000000
--- a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 4c3a134633..0000000000
--- a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
-
-XORG_PN = "libXevie"
-
diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
deleted file mode 100644
index fc2061514a..0000000000
--- a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Server Extension library"
-PRIORITY = "optional"
-
-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
deleted file mode 100644
index fc2061514a..0000000000
--- a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Server Extension library"
-PRIORITY = "optional"
-
-DEPENDS += " xproto virtual/libx11 xextproto libxau"
-PROVIDES = "xext"
-
-XORG_PN = "libXext"
-
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
deleted file mode 100644
index b63633dea2..0000000000
--- a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Fixes extension library."
-LICENSE= "BSD-X"
-
-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
deleted file mode 100644
index b63633dea2..0000000000
--- a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Fixes extension library."
-LICENSE= "BSD-X"
-
-DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
-
-XORG_PN = "libXfixes"
-
diff --git a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index f49c207637..0000000000
--- a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
-S = "${WORKDIR}/libXfont-${PV}"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
deleted file mode 100644
index e4d721dfe4..0000000000
--- a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXfont-${PV}.tar.bz2"
-S = "${WORKDIR}/libXfont-${PV}"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb
deleted file mode 100644
index 073b54f7cf..0000000000
--- a/packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
-S = "${WORKDIR}/libXfont-1.2.0"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
deleted file mode 100644
index a3a28d6578..0000000000
--- a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-
-PR = "r1"
-SRC_URI += "file://no-scalable-crash.patch;patch=1"
-
-
-DESCRIPTION = "X font library (used by the X server)."
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PROVIDES = "xfont"
-
-XORG_PN = "libXfont"
-
diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
deleted file mode 100644
index 748a71f1ae..0000000000
--- a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X font library (used by the X server)."
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PROVIDES = "xfont"
-
-XORG_PN = "libXfont"
-
diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
deleted file mode 100644
index 8739822a07..0000000000
--- a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require xorg-lib-common.inc
-
-PR = "r1"
-
-DESCRIPTION = "X font library (used by the X server)."
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
-SRC_URI += "file://no-scalable-crash.patch;patch=1"
-
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PROVIDES = "xfont"
-
-XORG_PN = "libXfont"
-
-S = "${WORKDIR}/libXfont-1.2.0"
diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
deleted file mode 100644
index c75278ecb0..0000000000
--- a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index c75278ecb0..0000000000
--- a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
-
-XORG_PN = "libXfontcache"
-
diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb
deleted file mode 100644
index 5ae8247296..0000000000
--- a/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require xorg-lib-common.inc
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/libXft-2.1.12.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-2.1.12"
-
-
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-
-DEPENDS += " libxrender freetype fontconfig"
-PROVIDES = "xft"
-
-XORG_PN = "libXft"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
-python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_${PN}', 'libxft2', d)
- bb.build.exec_func('package_do_package', d)
-}
diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
deleted file mode 100644
index 092c25d3ab..0000000000
--- a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-
-DEPENDS += " libxrender freetype fontconfig"
-PROVIDES = "xft"
-
-XORG_PN = "libXft"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
-python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_${PN}', 'libxft2', d)
- bb.build.exec_func('package_do_package', d)
-}
diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
deleted file mode 100644
index af5e4008eb..0000000000
--- a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Input extension library."
-
-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
deleted file mode 100644
index af5e4008eb..0000000000
--- a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Input extension library."
-
-DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
-
-XORG_PN = "libXi"
-
diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
deleted file mode 100644
index 8f72c20898..0000000000
--- a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xinerama library"
-PRIORITY = "optional"
-
-DEPENDS += " virtual/libx11 libxext xextproto xineramaproto"
-PROVIDES = "xinerama"
-
-XORG_PN = "libXinerama"
-
diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
deleted file mode 100644
index 715dcd0554..0000000000
--- a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 keyboard library"
-LICENSE= "GPL"
-PRIORITY = "optional"
-
-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
deleted file mode 100644
index 715dcd0554..0000000000
--- a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 keyboard library"
-LICENSE= "GPL"
-PRIORITY = "optional"
-
-DEPENDS += " virtual/libx11 kbproto"
-
diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
deleted file mode 100644
index e094728c2f..0000000000
--- a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 lbxkbui library"
-LICENSE= "GPL"
-PRIORITY = "optional"
-
-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
deleted file mode 100644
index e094728c2f..0000000000
--- a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 lbxkbui library"
-LICENSE= "GPL"
-PRIORITY = "optional"
-
-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
deleted file mode 100644
index 02df24cd9f..0000000000
--- a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Window System miscellaneous utility library"
-PRIORITY = "optional"
-
-DEPENDS += " libxt libxext xextproto virtual/libx11"
-PROVIDES = "xmu"
-
-XORG_PN = "libXmu"
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "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
deleted file mode 100644
index 02df24cd9f..0000000000
--- a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Window System miscellaneous utility library"
-PRIORITY = "optional"
-
-DEPENDS += " libxt libxext xextproto virtual/libx11"
-PROVIDES = "xmu"
-
-XORG_PN = "libXmu"
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "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
deleted file mode 100644
index fc7ecb5778..0000000000
--- a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X print extension library."
-
-DEPENDS += " virtual/libx11 libxext xextproto libxau printproto"
-
-XORG_PN = "libXp"
-
-CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-EXTRA_OECONF="--enable-malloc0returnsnull"
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
deleted file mode 100644
index 3ff582a8e3..0000000000
--- a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Pixmap library."
-PRIORITY = "optional"
-LICENSE = "X-BSD"
-
-DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
-
-XORG_PN = "libXpm"
-
-PACKAGES =+ "sxpm cxpm"
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
deleted file mode 100644
index 3ff582a8e3..0000000000
--- a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Pixmap library."
-PRIORITY = "optional"
-LICENSE = "X-BSD"
-
-DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
-
-XORG_PN = "libXpm"
-
-PACKAGES =+ "sxpm cxpm"
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
deleted file mode 100644
index 077ac40a0a..0000000000
--- a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index f965b9a2bc..0000000000
--- a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxp libxt printproto libxau"
-
-XORG_PN = "libXprintUtil"
-
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
deleted file mode 100644
index 363550fade..0000000000
--- a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Resize and Rotate extension library."
-LICENSE = "BSD-X"
-
-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
deleted file mode 100644
index 363550fade..0000000000
--- a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Resize and Rotate extension library."
-LICENSE = "BSD-X"
-
-DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
-
-XORG_PN = "libXrandr"
-
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
deleted file mode 100644
index 32ba95721d..0000000000
--- a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD-X"
-
-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
deleted file mode 100644
index 32ba95721d..0000000000
--- a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD-X"
-
-DEPENDS += " virtual/libx11 renderproto"
-
-XORG_PN = "libXrender"
-
diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
deleted file mode 100644
index 282947e7fe..0000000000
--- a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Resource usage library."
-
-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
deleted file mode 100644
index 282947e7fe..0000000000
--- a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Resource usage library."
-
-DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
-
-XORG_PN = "libXres"
-
diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
deleted file mode 100644
index 2f0168e2b5..0000000000
--- a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X screen saver extension library."
-LICENSE = "GPL"
-
-DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
-
-XORG_PN = "libXScrnSaver"
-
-PROVIDES = "libxss"
-RREPLACES = "libxss"
-
-#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
deleted file mode 100644
index 2f0168e2b5..0000000000
--- a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X screen saver extension library."
-LICENSE = "GPL"
-
-DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
-
-XORG_PN = "libXScrnSaver"
-
-PROVIDES = "libxss"
-RREPLACES = "libxss"
-
-#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
deleted file mode 100644
index 520ab10c0e..0000000000
--- a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Toolkit Intrinsics"
-PRIORITY = "optional"
-
-DEPENDS += " libsm virtual/libx11 xproto kbproto"
-PROVIDES = "xt"
-
-XORG_PN = "libXt"
-
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- ) || exit 1
- oe_runmake
-}
diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
deleted file mode 100644
index 520ab10c0e..0000000000
--- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Toolkit Intrinsics"
-PRIORITY = "optional"
-
-DEPENDS += " libsm virtual/libx11 xproto kbproto"
-PROVIDES = "xt"
-
-XORG_PN = "libXt"
-
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- ) || exit 1
- oe_runmake
-}
diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
deleted file mode 100644
index f9ebac47f9..0000000000
--- a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 802ea2836d..0000000000
--- a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Test Extension: client side library"
-PRIORITY = "optional"
-
-DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto"
-PROVIDES = "xtst"
-
-XORG_PN = "libXtst"
-
diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
deleted file mode 100644
index 0d045940e3..0000000000
--- a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Video extension library."
-LICENSE = "GPL"
-
-DEPENDS += " virtual/libx11 libxext xextproto videoproto"
-
-XORG_PN = "libXv"
-
diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
deleted file mode 100644
index a0f9f7be25..0000000000
--- a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Video Motion Compensation extension library."
-
-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
deleted file mode 100644
index a0f9f7be25..0000000000
--- a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Video Motion Compensation extension library."
-
-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
deleted file mode 100644
index e067190b84..0000000000
--- a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xxf86dga extension library."
-
-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
deleted file mode 100644
index e067190b84..0000000000
--- a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xxf86dga extension library."
-
-DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
-
-XORG_PN = "libXxf86dga"
-
diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
deleted file mode 100644
index 3af4acba96..0000000000
--- a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index 3af4acba96..0000000000
--- a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-
-#DESCRIPTION = ""
-
-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
deleted file mode 100644
index b85e2d2477..0000000000
--- a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xxf86vm extension library."
-
-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
deleted file mode 100644
index b85e2d2477..0000000000
--- a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Xxf86vm extension library."
-
-DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
-
-XORG_PN = "libXxf86vm"
-
diff --git a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index 7d24f07432..0000000000
--- a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-
-DEPENDS = "util-macros-native"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/xtrans-${PV}.tar.bz2"
-S = "${WORKDIR}/xtrans-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
deleted file mode 100644
index 2c38782a57..0000000000
--- a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-PR = "r1"
-
-SRC_URI += "file://fix-missing-includepath.patch;patch=1"
-
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
deleted file mode 100644
index 1f4cf97e70..0000000000
--- a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
deleted file mode 100644
index f46c1da93e..0000000000
--- a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2"
-S = "${WORKDIR}/bigreqsproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
deleted file mode 100644
index 1f4cf97e70..0000000000
--- a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
deleted file mode 100644
index 59eae3a0bb..0000000000
--- a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
deleted file mode 100644
index 59eae3a0bb..0000000000
--- a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
deleted file mode 100644
index a05558f979..0000000000
--- a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "damageext"
diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
deleted file mode 100644
index 16ff0441b5..0000000000
--- a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
deleted file mode 100644
index 16ff0441b5..0000000000
--- a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
deleted file mode 100644
index a9ff843cb3..0000000000
--- a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
-S = "${WORKDIR}/fontcacheproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
deleted file mode 100644
index 34a32f97be..0000000000
--- a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
-S = "${WORKDIR}/fontsproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
deleted file mode 100644
index c47701289d..0000000000
--- a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
-S = "${WORKDIR}/inputproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/inputproto_X11R7.1-1.4.bb b/packages/xorg-proto/inputproto_X11R7.1-1.4.bb
deleted file mode 100644
index 26260c401e..0000000000
--- a/packages/xorg-proto/inputproto_X11R7.1-1.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-proto-common.inc
-
-SRC_URI = "${XORG_MIRROR}/individual/proto/inputproto-1.4.tar.gz"
-S = "${WORKDIR}/${XORG_PN}-1.4"
diff --git a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
deleted file mode 100644
index e7d1f9c992..0000000000
--- a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2"
-S = "${WORKDIR}/kbproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb
deleted file mode 100644
index 813143995d..0000000000
--- a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-
-SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-1.0.3"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index ffdbf51ebf..0000000000
--- a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "randrext"
diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
deleted file mode 100644
index 255ab83609..0000000000
--- a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "recordext"
diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
deleted file mode 100644
index 881eed5240..0000000000
--- a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "renderext"
diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
deleted file mode 100644
index 231eb0b37f..0000000000
--- a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "resourceext"
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
deleted file mode 100644
index 1ccfc89032..0000000000
--- a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
-S = "${WORKDIR}/xcmiscproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
deleted file mode 100644
index 50d6c5b2e9..0000000000
--- a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
-S = "${WORKDIR}/xextproto-${PV}"
-
-inherit native autotools pkgconfig
-
-PROVIDES = "xextensions-native"
diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
deleted file mode 100644
index 3b35a020e4..0000000000
--- a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-PROVIDES = "xextensions"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
deleted file mode 100644
index e37d738633..0000000000
--- a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
-S = "${WORKDIR}/xf86bigfontproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
deleted file mode 100644
index 18207c0307..0000000000
--- a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "xxf86dgaext"
diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
deleted file mode 100644
index d3acf1f590..0000000000
--- a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-CONFLICTS = "xxf86vmext"
diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
deleted file mode 100644
index 34a74b77e8..0000000000
--- a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2"
-S = "${WORKDIR}/xproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
deleted file mode 100644
index 80ddcd7e6e..0000000000
--- a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2"
-S = "${WORKDIR}/xproto-${PV}"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb
deleted file mode 100644
index a901c5b61b..0000000000
--- a/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-proto-common.inc
-
-XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/development/X11R7.2-RC3/proto/${XORG_PN}-7.0.9.tar.gz"
-S = "${WORKDIR}/${XORG_PN}-7.0.9"
-
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
deleted file mode 100644
index b265a53346..0000000000
--- a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-
-PROVIDES="xproxymngproto"
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
deleted file mode 100644
index f9dc1f3d3e..0000000000
--- a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
deleted file mode 100644
index f9dc1f3d3e..0000000000
--- a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/packages/xorg-util/imake_X11R7.0-1.0.1.bb
deleted file mode 100644
index b2b11cf038..0000000000
--- a/packages/xorg-util/imake_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "imake utility"
-
-DEPENDS += " perl xproto"
-
diff --git a/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/packages/xorg-util/imake_X11R7.1-1.0.2.bb
deleted file mode 100644
index b2b11cf038..0000000000
--- a/packages/xorg-util/imake_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "imake utility"
-
-DEPENDS += " perl xproto"
-
diff --git a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
deleted file mode 100644
index 09a7787ee3..0000000000
--- a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xproto"
-
diff --git a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
deleted file mode 100644
index 1b8476be47..0000000000
--- a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-util-common.inc
-inherit native
-
-#DESCRIPTION = ""
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2"
-S="${WORKDIR}/makedepend-${PV}"
-
-DEPENDS += " util-macros-native xproto-native"
-
diff --git a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
deleted file mode 100644
index 09a7787ee3..0000000000
--- a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " xproto"
-
diff --git a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
deleted file mode 100644
index dcfc7ebaee..0000000000
--- a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2"
-S = "${WORKDIR}/util-macros-${PV}"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
deleted file mode 100644
index 239750bb80..0000000000
--- a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
-S = "${WORKDIR}/util-macros-${PV}"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb
deleted file mode 100644
index 64e0550571..0000000000
--- a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-
-SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \
- file://unbreak_cross_compile.patch;patch=1 "
-
-S = "${WORKDIR}/util-macros-1.1.5"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
deleted file mode 100644
index 4e2ddece48..0000000000
--- a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
deleted file mode 100644
index 4e2ddece48..0000000000
--- a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-
-#DEPENDS += " "
-
diff --git a/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
deleted file mode 100644
index 06dd0a5d73..0000000000
--- a/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-
-PR = "r1"
-
-SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \
- file://unbreak_cross_compile.patch;patch=1 "
-S = "${WORKDIR}/${XORG_PN}-1.1.5"
-
diff --git a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
deleted file mode 100644
index f1b6b0d4f7..0000000000
--- a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-util-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
deleted file mode 100644
index f1b6b0d4f7..0000000000
--- a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-util-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
deleted file mode 100644
index 4783c6878a..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "X server for Imageon Cards from freedesktop.org"
-DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset"
-
-COMPATIBLE_MACHINE = "(c7x0|hx4700)"
-
-SECTION = "x11/base"
-LICENSE = "MIT"
-
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
-
-PROVIDES = "virtual/xserver"
-
-PR = "r3"
-
-FILESPATH = "${FILE_DIRNAME}/xserver-kdrive"
-
-SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://kdrive-evdev.patch;patch=1 \
- file://kdrive-use-evdev.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://enable-builtin-fonts.patch;patch=1 \
- file://optional-xkb.patch;patch=1 \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
- file://enable-tslib.patch;patch=1 \
- file://xcalibrate.patch;patch=1 \
- file://kdrive-vidmemarea.patch;patch=1 \
- file://kdrive-imageon.patch;patch=1"
-
-S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
-
-inherit autotools pkgconfig
-
-ARM_INSTRUCTION_SET = "arm"
-W100_OECONF_arm = "--enable-imageon"
-
-EXTRA_OECONF = "--enable-composite --enable-kdrive \
- --disable-dga --disable-dri --disable-xinerama \
- --disable-xf86misc --disable-xf86vidmode \
- --disable-xorg --disable-xorgcfg \
- --disable-xkb --disable-xnest --disable-xvfb \
- --disable-xevie --disable-xprint --disable-xtrap \
- --disable-dmx ${W100_OECONF} \
- --with-default-font-path=built-ins \
- --enable-tslib --enable-xcalibrate \
- ac_cv_file__usr_share_X11_sgml_defs_ent=no"
-
-FILES_${PN} = "${libdir}/xserver/SecurityPolicy \
- ${bindir}/Ximageon"
diff --git a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
deleted file mode 100644
index 0c0b64bf14..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac~ 2005-06-03 17:23:36.000000000 +0200
-+++ configure.ac 2005-06-03 17:23:36.000000000 +0200
-@@ -447,10 +447,6 @@
- KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
- fi
-
--if test "$TSLIB" = yes; then
-- KDRIVE_LIBS="${KDRIVE_LIBS} -lts"
--fi
--
- AC_SUBST([KDRIVE_PURE_LIBS])
- AC_SUBST([KDRIVE_PURE_INCS])
- AC_SUBST([KDRIVE_LIBS])
diff --git a/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
deleted file mode 100644
index f87e7cc2cd..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
-@@ -198,6 +198,11 @@
- return FALSE;
- }
-
-+ /* Re-get the "fixed" parameters since they might have changed */
-+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
-+ if (k < 0)
-+ perror ("FBIOGET_FSCREENINFO");
-+
- /* Now get the new screeninfo */
- ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
- depth = priv->var.bits_per_pixel;
diff --git a/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
deleted file mode 100644
index 22ad51c5ad..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: hw/kdrive/src/kmode.c
-===================================================================
-RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
-retrieving revision 1.13
-diff -u -r1.13 kmode.c
---- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13
-+++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000
-@@ -41,6 +41,11 @@
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 32, 96, 192, KdSyncPositive, /* 26.413 */
diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
deleted file mode 100644
index d4a184b484..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-LICENSE = "MIT"
-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"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
-
-PR = "r2"
-
-FILES_${PN} = "${bindir}/Xomap"
-
-SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \
- file://kmode.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://configure-tslib.patch;patch=1;pnum=0"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
- --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr"
diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
deleted file mode 100644
index 7837884a75..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-LICENSE = "MIT"
-DEPENDS = "xcalibrateext tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto xpext xsp libxkbfile dbus"
-
-PROVIDES = "virtual/xserver"
-PACKAGES =+ "xserver-kdrive-xomap"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800"
-
-PR = "r4"
-
-COMPATIBLE_MACHINE = "nokia800"
-
-FILES_${PN} = "${libdir}/xserver /etc/dbus-1/* ${bindir}/Xomap"
-
-SRC_URI = "http://repository.maemo.org/pool/maemo3.0/free/source/xorg-server_1.1.99.3-0osso31.tar.gz \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://enable-builtin-fonts.patch;patch=1 \
- file://xcalibrate.patch;patch=1 \
- file://fixups.patch;patch=1 \
- file://button_only.patch;patch=1 \
- file://calibrateext.patch;patch=1"
-# file://kdrive-evdev.patch;patch=1 \
-# file://kdrive-use-evdev.patch;patch=1 \
-# file://optional-xkb.patch;patch=1 \
-# file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-# file://enable-tslib.patch;patch=1 \
-# file://xfbdev-fb-opt.patch;patch=1"
-
-S = "${WORKDIR}/xorg-server-1.1.99.3"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --enable-kdrive --enable-builtin-fonts \
- --disable-dga --disable-dri --disable-xinerama \
- --disable-xf86misc --disable-xf86vidmode \
- --disable-xorg --disable-xorgcfg \
- --disable-dmx --enable-xcalibrate \
- --disable-xkb --disable-xnest --disable-xvfb \
- --disable-xevie --disable-xprint --disable-xtrap \
- --with-default-font-path=built-ins \
- --disable-xsdl \
- ac_cv_file__usr_share_X11_sgml_defs_ent=no \
- --enable-xomap"
diff --git a/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
deleted file mode 100644
index 596e498b80..0000000000
--- a/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
+++ /dev/null
@@ -1,464 +0,0 @@
---- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100
-@@ -79,7 +79,7 @@
- # tslib touchscreen driver
- AC_CHECK_HEADERS([tslib.h])
-
--REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
-+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
-
- DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
- DEFAULT_VENDOR_STRING="freedesktop.org"
---- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100
-@@ -79,7 +79,6 @@
- #endif
-
- #include "windowstr.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "gcstruct.h"
- #include "selection.h"
---- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100
-@@ -51,7 +51,6 @@
- #include <config.h>
- #endif
- #include "misc.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "scrnintstr.h"
- #include "gcstruct.h"
---- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100
-@@ -89,7 +89,6 @@
- #include "colormap.h"
- #include "colormapst.h"
- #include "cursorstr.h"
--#include "font.h"
- #include "opaque.h"
- #include "servermd.h"
- #include "site.h"
---- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100
-@@ -57,7 +57,7 @@
- #include <X11/Xproto.h>
- #include "misc.h"
- #include "dixstruct.h"
--#include "fontstruct.h"
-+#include "dixfont.h"
- #include "scrnintstr.h"
- #include "swaprep.h"
- #include "globals.h"
---- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100
-@@ -31,7 +31,7 @@
- #include <config.h>
- #endif
- #include "misc.h"
--#include "font.h"
-+#include "dixfont.h"
-
- Bool
- XpClientIsBitmapClient(ClientPtr client)
---- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100
-@@ -26,7 +26,6 @@
- #include <config.h>
- #endif
- #include "fb.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
-
- Bool
---- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100
-@@ -38,7 +38,6 @@
- #include "pixmapstr.h"
- #include "regionstr.h"
- #include "mistruct.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "fb.h"
- #include "migc.h"
---- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100
-@@ -51,7 +51,6 @@
- #include "pixmapstr.h"
- #include "regionstr.h"
- #include "mistruct.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "fb.h"
- #include "migc.h"
---- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100
-@@ -29,7 +29,6 @@
- #endif
- #include "kdrive.h"
- #include "kaa.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
-
- #define DEBUG_MIGRATE 0
---- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100
-@@ -27,10 +27,10 @@
- #define DIXFONT_H 1
-
- #include "dix.h"
--#include "font.h"
--#include "fontconf.h"
-+#include <X11/fonts/font.h>
-+#include <X11/fonts/fontconf.h>
- #include "closure.h"
--#include "fontstruct.h"
-+#include <X11/fonts/fontstruct.h>
-
- #define NullDIXFontProp ((DIXFontPropPtr)0)
-
---- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100
-@@ -27,7 +27,6 @@
-
- #include "servermd.h"
- #include "dixfont.h"
--#include "fontstruct.h"
- #include "closure.h"
- #define NEED_REPLIES
- #include "X11/Xproto.h" /* for xQueryFontReply */
---- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100
-@@ -57,7 +57,6 @@
- #include "gcstruct.h"
- #include "windowstr.h"
- #include "pixmapstr.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "dixstruct.h" /* For requestingClient */
- #include "mi.h"
---- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100
-@@ -55,7 +55,6 @@
- #include <X11/Xmd.h>
- #include <X11/Xproto.h>
- #include "misc.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "gcstruct.h"
- #include "windowstr.h"
---- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100
-@@ -54,7 +54,7 @@
- #include "validate.h"
- #include "window.h"
- #include "gc.h"
--#include "font.h"
-+#include "dixfont.h"
- #include "input.h"
- #include "cursor.h"
-
---- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100
-@@ -54,6 +54,8 @@
- #include "extension.h"
- #include "micmap.h"
- #include "xext.h"
-+#include "pixmap.h"
-+#include "gc.h"
-
- #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
- #undef PEXEXT
---- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100
-@@ -63,7 +63,6 @@
- #include <X11/Xproto.h>
- #include "misc.h"
- #include "gcstruct.h"
--#include "fontstruct.h"
- #include "dixfontstr.h"
- #include "mi.h"
-
---- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100
-@@ -42,7 +42,6 @@
- # include "input.h"
- # include "mi.h"
- # include "cursorstr.h"
--# include "font.h"
- # include "scrnintstr.h"
- # include "colormapst.h"
- # include "windowstr.h"
-@@ -50,7 +49,6 @@
- # include "mipointer.h"
- # include "mispritest.h"
- # include "dixfontstr.h"
--# include "fontstruct.h"
- #ifdef RENDER
- # include "mipict.h"
- #endif
---- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100
-@@ -28,9 +28,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100
-@@ -29,9 +29,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100
-@@ -29,9 +29,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100
-@@ -28,9 +28,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100
-@@ -28,9 +28,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100
-@@ -28,9 +28,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100
-@@ -28,9 +28,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100
-@@ -30,9 +30,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100
-@@ -25,9 +25,7 @@
- #include <X11/X.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
--#include "font.h"
- #include "dixfontstr.h"
--#include "fontstruct.h"
- #include "mi.h"
- #include "regionstr.h"
- #include "globals.h"
---- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100
-@@ -27,4 +27,4 @@
-
- #include "config.h"
-
--#include <transport.c>
-+#include <X11/Xtrans/transport.c>
---- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100
-@@ -25,4 +25,4 @@
- #define XSERV_t
- #define TRANS_SERVER
-
--#include <Xtrans.h>
-+#include <X11/Xtrans/Xtrans.h>
---- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100
-@@ -32,27 +32,6 @@
- #include "pixmap.h"
- #include "gc.h"
-
--typedef struct _ShmFuncs {
-- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen,
-- int width,
-- int height,
-- int depth,
-- char *addr);
-- void (* PutImage)(DrawablePtr dst,
-- GCPtr pGC,
-- int depth,
-- unsigned int format,
-- int w,
-- int h,
-- int sx,
-- int sy,
-- int sw,
-- int sh,
-- int dx,
-- int dy,
-- char *data);
--} ShmFuncs, *ShmFuncsPtr;
--
- void
- ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
-
---- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100
-+++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100
-@@ -48,7 +48,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-
- ******************************************************************/
--/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */
-+/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */
-
- #ifndef _SYNCINT_H_
- #define _SYNCINT_H_
-@@ -57,26 +57,10 @@
-
- #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
-
--typedef struct _SyncCounter {
-- ClientPtr client; /* Owning client. 0 for system counters */
-- XSyncCounter id; /* resource ID */
-- CARD64 value; /* counter value */
-- struct _SyncTriggerList *pTriglist; /* list of triggers */
-- Bool beingDestroyed; /* in process of going away */
-- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
--} SyncCounter;
--
- /*
- * The System Counter interface
- */
-
--typedef enum {
-- XSyncCounterNeverChanges,
-- XSyncCounterNeverIncreases,
-- XSyncCounterNeverDecreases,
-- XSyncCounterUnrestricted
--} SyncCounterType;
--
- typedef void
- (*SyncQueryValueProcPtr) (pointer pCounter,
- CARD64 *freshvalue);
-@@ -86,16 +70,6 @@
- CARD64 *lessthan,
- CARD64 *greaterthan);
-
--typedef struct _SysCounterInfo {
-- char *name;
-- CARD64 resolution;
-- CARD64 bracket_greater;
-- CARD64 bracket_less;
-- SyncCounterType counterType; /* how can this counter change */
-- SyncQueryValueProcPtr QueryValue;
-- SyncBracketValuesProcPtr BracketValues;
--} SysCounterInfo;
--
- struct _SyncTrigger;
-
- typedef Bool
-@@ -108,55 +82,6 @@
- typedef void
- (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger);
-
--typedef struct _SyncTrigger {
-- SyncCounter *pCounter;
-- CARD64 wait_value; /* wait value */
-- unsigned int value_type; /* Absolute or Relative */
-- unsigned int test_type; /* transition or Comparision type */
-- CARD64 test_value; /* trigger event threshold value */
-- SyncCheckTriggerProcPtr CheckTrigger;
-- SyncTriggerFiredProcPtr TriggerFired;
-- SyncCounterDestroyedProcPtr CounterDestroyed;
--} SyncTrigger;
--
--typedef struct _SyncTriggerList {
-- SyncTrigger *pTrigger;
-- struct _SyncTriggerList *next;
--} SyncTriggerList;
--
--typedef struct _SyncAlarmClientList {
-- ClientPtr client;
-- XID delete_id;
-- struct _SyncAlarmClientList *next;
--} SyncAlarmClientList;
--
--typedef struct _SyncAlarm {
-- SyncTrigger trigger;
-- ClientPtr client;
-- XSyncAlarm alarm_id;
-- CARD64 delta;
-- int events;
-- int state;
-- SyncAlarmClientList *pEventClients;
--} SyncAlarm;
--
--typedef struct {
-- ClientPtr client;
-- CARD32 delete_id;
-- int num_waitconditions;
--} SyncAwaitHeader;
--
--typedef struct {
-- SyncTrigger trigger;
-- CARD64 event_threshold;
-- SyncAwaitHeader *pHeader;
--} SyncAwait;
--
--typedef union {
-- SyncAwaitHeader header;
-- SyncAwait await;
--} SyncAwaitUnion;
--
- pointer
- SyncCreateSystemCounter(char *name,
- CARD64 inital_value,
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
deleted file mode 100644
index 3f97527553..0000000000
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require xserver-kdrive-common.inc
-
-DEPENDS += "xcalibrateext"
-
-PR = "r10"
-
-PACKAGES =+ "xserver-kdrive-w100"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \
- ${KDRIVE_COMMON_PATCHES} \
- file://xcalibrate.patch;patch=1 \
- file://w100.patch;patch=1 \
- "
-
-S = "${WORKDIR}/xorg-server-${PV}"
-
-W100_OECONF = "--disable-w100"
-W100_OECONF_arm = "--enable-w100"
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
deleted file mode 100644
index e91a50a603..0000000000
--- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-xserver-common.inc
-
-PR = "r3"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-SRC_URI += " file://miext_layer_shadow_h.patch;patch=1 \
- file://xpconfig-parentdir.patch;patch=1"
-
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
deleted file mode 100644
index 3c29684394..0000000000
--- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-xserver-common.inc
-
-SRC_URI += "file://drmfix.patch;patch=1"
-
-PR = "r3"
-
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/packages/xscrnsaverh/xscrnsaverh_1.0.bb b/packages/xscrnsaverh/xscrnsaverh_1.0.bb
index 7fc7e6e15a..2989054f44 100644
--- a/packages/xscrnsaverh/xscrnsaverh_1.0.bb
+++ b/packages/xscrnsaverh/xscrnsaverh_1.0.bb
@@ -1,7 +1,7 @@
PR = "r0"
-DEPENDS = "xextensions"
+DEPENDS = "libxext"
SECTION = "x11"
LICENSE = "X-MIT"
DESCRIPTION = "missing header"