Merge commit 'e92bf9bc7e9b2761fd46c6fbdb230128041f8325' into shr-testing2009

10 files changed, 441 insertions, 0 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4766deb621..ca1166a926 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13374,6 +13374,10 @@ sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8
 md5=9d5045a5c76b1fe360221b967a5aa0e9
 sha256=e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2
 
+[http://xorg.freedesktop.org/releases/individual/app/lbxproxy-1.0.2.tar.bz2]
+md5=0aa9284354552ce6700485a36d2803c3
+sha256=7ec5dee387bb6f3125392c0faca1c9712898b31e1410de9767e0d933b21cb679
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/lbxproxy-X11R7.0-1.0.1.tar.bz2]
 md5=d9c05283660eae742a77dcbc0091841a
 sha256=35360dd6160d94a981d923486a026fe91dfc3e0db2f5923aeb782b7e9c5e606f
@@ -27794,6 +27798,10 @@ sha256=6e1cdf207ca998acd4e1cc991bde47fcf9d01d24ba733f9d3afe3c64843ef838
 md5=3eb1c2b7a6ceaec4ee872cb06d202d91
 sha256=4bf647745b4de940ef75796fc8ad4e1f83c276e474f7b6779f317fcd070de884
 
+[http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.5.tar.bz2]
+md5=bf8faa8c540bfdcd0252801d8f16d868
+sha256=bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571
+
 [http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.2.tar.bz2]
 md5=8678ddd23573022d68dcd883ae239be8
 sha256=45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377
@@ -28258,6 +28266,10 @@ sha256=dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9
 md5=21dac6461379d67ee3b333c77f63e7bf
 sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.1.tar.bz2]
+md5=e56ce4424b89b2409c6e73e007a85da7
+sha256=462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
@@ -28342,6 +28354,10 @@ sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b
 md5=29cce86738411c9f8de04375090bbbec
 sha256=7224e93a8560362d454a104e8bb481213dcb559b41516c7b883c0881e25252bb
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.5.0.tar.bz2]
+md5=79b20f86d1b2e625ae65e35c3457027f
+sha256=718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2]
 md5=9e3ba60836f4c1d2e4cebc63a28321b4
 sha256=9b69192a4368bafeaf94432ec50025dd3f60340290ef2500f6032159870ed489
@@ -30090,6 +30106,10 @@ sha256=ec744335f06c070d30f7f256262f6326c2cfff35a0ed6178e7be18ad44ad8a86
 md5=72fc8dd68f585000c0a542eba0264571
 sha256=7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093
 
+[http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.2.tar.bz2]
+md5=fec79887ca14575bef4c757b4e95a693
+sha256=fed1be13409b6963d88ee668da4670cd6da5bd9aff95576234df8849e2084002
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xgc-X11R7.0-1.0.1.tar.bz2]
 md5=8cd01cf558c3eed738115abcf720277d
 sha256=6151d08a12e7a9874738c46119c6ffe8383d1fe6c5d10ffc9d88e2adc8e454e8
@@ -30174,6 +30194,10 @@ sha256=c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590
 md5=93c73705ed9eb1e1a6b6938405672f2b
 sha256=b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785
 
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.2.0.tar.bz2]
+md5=fe1696cab2fbed6fa059d0cd1c53ac13
+sha256=ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
 md5=6d2df59fa328cbc99c0de98bc2e14597
 sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
@@ -30254,6 +30278,10 @@ sha256=86ab048045dcd1de690de0b040235040f496c686730ad557c912e0f40edf5c4a
 md5=b98ae2d8b21c545b7b322d0b302efefa
 sha256=008dffea5b213880cb3ebd40d0b9bf0cc10392fb0349831efdebf2a428dd2e17
 
+[http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.2.tar.bz2]
+md5=3d3eb10466442354d6b73b503b9829db
+sha256=2e51b3c2d33da885be6d955007ae7e025b8f8b21f7fe6d21387690d9f5cadb92
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbprint-X11R7.0-1.0.1.tar.bz2]
 md5=6235c39690968d0a9a4c1b1c16c8905a
 sha256=d2e9c3c28e23010441ce40c48bda7adabd338a256cb9b99848be6ed937fc10e7
@@ -30590,6 +30618,10 @@ sha256=0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
 md5=dda7842467cda6018fdc87e6002e4db1
 sha256=a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.2.tar.bz2]
+md5=5c087e0f555203065fd90d02ef5f736e
+sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
new file mode 100644
index 0000000000..0c3c53e40f
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -0,0 +1,353 @@
+#Sun Nov 29 09:04:41 CET 2009
+#app
+PREFERRED_VERSION_appres ?= "1.0.2"
+PREFERRED_VERSION_bdftopcf ?= "1.0.2"
+PREFERRED_VERSION_bdftopcf-native ?= "1.0.2"
+PREFERRED_VERSION_beforelight ?= "1.0.3"
+PREFERRED_VERSION_bitmap ?= "1.0.4"
+PREFERRED_VERSION_constype ?= "1.0.2"
+PREFERRED_VERSION_editres ?= "1.0.4"
+PREFERRED_VERSION_fonttosfnt ?= "1.0.4"
+PREFERRED_VERSION_fslsfonts ?= "1.0.2"
+PREFERRED_VERSION_fstobdf ?= "1.0.3"
+PREFERRED_VERSION_iceauth ?= "1.0.3"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.2"
+PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_luit ?= "1.0.4"
+PREFERRED_VERSION_mkcfm ?= "1.0.1"
+PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
+PREFERRED_VERSION_mkfontdir ?= "1.0.5"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.5"
+PREFERRED_VERSION_mkfontscale ?= "1.0.7"
+PREFERRED_VERSION_mkfontscale-native ?= "1.0.7"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rendercheck ?= "1.3"
+PREFERRED_VERSION_rgb ?= "1.0.3"
+PREFERRED_VERSION_rstart ?= "1.0.3"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.5"
+PREFERRED_VERSION_setxkbmap ?= "1.1.0"
+PREFERRED_VERSION_showfont ?= "1.0.2"
+PREFERRED_VERSION_smproxy ?= "1.0.3"
+PREFERRED_VERSION_twm ?= "1.0.4"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_x11perf ?= "1.5.1"
+PREFERRED_VERSION_xauth ?= "1.0.4"
+PREFERRED_VERSION_xbacklight ?= "1.1.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "1.1.0"
+PREFERRED_VERSION_xclock ?= "1.0.4"
+PREFERRED_VERSION_xcmsdb ?= "1.0.2"
+PREFERRED_VERSION_xcompmgr ?= "1.1.5"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.9"
+PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
+PREFERRED_VERSION_xdriinfo ?= "1.0.3"
+PREFERRED_VERSION_xedit ?= "1.1.2"
+PREFERRED_VERSION_xev ?= "1.0.4"
+PREFERRED_VERSION_xeyes ?= "1.0.991"
+PREFERRED_VERSION_xf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.1.0"
+PREFERRED_VERSION_xfsinfo ?= "1.0.2"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.3"
+PREFERRED_VERSION_xgc ?= "1.0.2"
+PREFERRED_VERSION_xhost ?= "1.0.3"
+PREFERRED_VERSION_xinit ?= "1.2.0"
+PREFERRED_VERSION_xinput ?= "1.5.0"
+PREFERRED_VERSION_xkbcomp ?= "1.1.1"
+PREFERRED_VERSION_xkbcomp-native ?= "1.1.1"
+PREFERRED_VERSION_xkbevd ?= "1.1.0"
+PREFERRED_VERSION_xkbprint ?= "1.0.2"
+PREFERRED_VERSION_xkbutils ?= "1.0.2"
+PREFERRED_VERSION_xkill ?= "1.0.2"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.2"
+PREFERRED_VERSION_xlsclients ?= "1.0.2"
+PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xmag ?= "1.0.3"
+PREFERRED_VERSION_xman ?= "1.1.0"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.4"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.3"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "1.1.0"
+PREFERRED_VERSION_xrandr ?= "1.3.2"
+PREFERRED_VERSION_xrdb ?= "1.0.6"
+PREFERRED_VERSION_xrefresh ?= "1.0.3"
+PREFERRED_VERSION_xrx ?= "1.0.3"
+PREFERRED_VERSION_xset ?= "1.1.0"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.1"
+PREFERRED_VERSION_xsetroot ?= "1.0.3"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.1.0"
+PREFERRED_VERSION_xwd ?= "1.0.3"
+PREFERRED_VERSION_xwininfo ?= "1.0.5"
+PREFERRED_VERSION_xwud ?= "1.0.2"
+#data
+PREFERRED_VERSION_xbitmaps ?= "1.1.0"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.2"
+PREFERRED_VERSION_xkbdata ?= "1.0.1"
+#doc
+PREFERRED_VERSION_xorg-docs ?= "1.5"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
+#driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.2"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.3.1"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5"
+PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.2"
+PREFERRED_VERSION_xf86-video-ast ?= "0.89.9"
+PREFERRED_VERSION_xf86-video-ati ?= "6.12.4"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.6"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
+PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.3"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.15"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4"
+PREFERRED_VERSION_xf86-video-savage ?= "2.3.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.2"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-trident ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4"
+#font
+PREFERRED_VERSION_encodings ?= "1.0.3"
+PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2"
+PREFERRED_VERSION_font-alias ?= "1.0.2"
+PREFERRED_VERSION_font-arabic-misc ?= "1.0.1"
+PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-ttf ?= "1.0.1"
+PREFERRED_VERSION_font-bh-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-cursor-misc ?= "1.0.1"
+PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1"
+PREFERRED_VERSION_font-dec-misc ?= "1.0.1"
+PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-isas-misc ?= "1.0.1"
+PREFERRED_VERSION_font-jis-misc ?= "1.0.1"
+PREFERRED_VERSION_font-micro-misc ?= "1.0.1"
+PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-meltho ?= "1.0.1"
+PREFERRED_VERSION_font-misc-misc ?= "1.1.0"
+PREFERRED_VERSION_font-mutt-misc ?= "1.0.1"
+PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2"
+PREFERRED_VERSION_font-sony-misc ?= "1.0.1"
+PREFERRED_VERSION_font-sun-misc ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.1.1"
+PREFERRED_VERSION_font-util-native ?= "1.1.1"
+PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2"
+#lib
+PREFERRED_VERSION_libapplewm ?= "1.4.0"
+PREFERRED_VERSION_libfs ?= "1.0.2"
+PREFERRED_VERSION_libice ?= "1.0.6"
+PREFERRED_VERSION_libice-native ?= "1.0.6"
+PREFERRED_VERSION_libsm ?= "1.1.1"
+PREFERRED_VERSION_libsm-native ?= "1.1.1"
+PREFERRED_VERSION_libwindowswm ?= "1.0.1"
+PREFERRED_VERSION_libx11 ?= "1.3.2"
+PREFERRED_VERSION_libx11-native ?= "1.3.2"
+PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
+PREFERRED_VERSION_libxtrap ?= "1.0.0"
+PREFERRED_VERSION_libxau ?= "1.0.5"
+PREFERRED_VERSION_libxau-native ?= "1.0.5"
+PREFERRED_VERSION_libxaw ?= "1.0.7"
+PREFERRED_VERSION_libxcomposite ?= "0.4.1"
+PREFERRED_VERSION_libxcursor ?= "1.1.10"
+PREFERRED_VERSION_libxcursor-native ?= "1.1.10"
+PREFERRED_VERSION_libxdamage ?= "1.1.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.3"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.1.1"
+PREFERRED_VERSION_libxext-native ?= "1.1.1"
+PREFERRED_VERSION_libxfixes ?= "4.0.4"
+PREFERRED_VERSION_libxfixes-native ?= "4.0.4"
+PREFERRED_VERSION_libxfont ?= "1.4.1"
+PREFERRED_VERSION_libxfont-native ?= "1.4.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.5"
+PREFERRED_VERSION_libxft ?= "2.1.14"
+PREFERRED_VERSION_libxi ?= "1.3"
+PREFERRED_VERSION_libxinerama ?= "1.1"
+PREFERRED_VERSION_libxmu ?= "1.0.5"
+PREFERRED_VERSION_libxp ?= "1.0.0"
+PREFERRED_VERSION_libxpm ?= "3.5.8"
+PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
+PREFERRED_VERSION_libxprintutil ?= "1.0.1"
+PREFERRED_VERSION_libxrandr ?= "1.3.0"
+PREFERRED_VERSION_libxrender ?= "0.9.5"
+PREFERRED_VERSION_libxrender-native ?= "0.9.5"
+PREFERRED_VERSION_libxres ?= "1.0.4"
+PREFERRED_VERSION_libxt ?= "1.0.7"
+PREFERRED_VERSION_libxt-native ?= "1.0.7"
+PREFERRED_VERSION_libxtst ?= "1.1.0"
+PREFERRED_VERSION_libxv ?= "1.0.5"
+PREFERRED_VERSION_libxvmc ?= "1.0.5"
+PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
+PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
+PREFERRED_VERSION_libdmx ?= "1.1.0"
+PREFERRED_VERSION_libfontenc ?= "1.0.5"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_liboldx ?= "1.0.1"
+PREFERRED_VERSION_libpciaccess ?= "0.10.9"
+PREFERRED_VERSION_libxkbfile ?= "1.0.6"
+PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_pixman ?= "0.17.2"
+PREFERRED_VERSION_xtrans ?= "1.2.5"
+PREFERRED_VERSION_xtrans-native ?= "1.2.5"
+#proto
+PREFERRED_VERSION_applewmproto ?= "1.4.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
+PREFERRED_VERSION_compositeproto ?= "0.4.1"
+PREFERRED_VERSION_damageproto ?= "1.2.0"
+PREFERRED_VERSION_dmxproto ?= "2.3"
+PREFERRED_VERSION_dri2proto ?= "2.1"
+PREFERRED_VERSION_evieext ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.1.1"
+PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
+PREFERRED_VERSION_fontsproto ?= "2.1.0"
+PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
+PREFERRED_VERSION_glproto ?= "1.4.10"
+PREFERRED_VERSION_inputproto ?= "2.0"
+PREFERRED_VERSION_inputproto-native ?= "2.0"
+PREFERRED_VERSION_kbproto ?= "1.0.4"
+PREFERRED_VERSION_kbproto-native ?= "1.0.4"
+PREFERRED_VERSION_printproto ?= "1.0.4"
+PREFERRED_VERSION_randrproto ?= "1.3.1"
+PREFERRED_VERSION_recordproto ?= "1.14"
+PREFERRED_VERSION_renderproto ?= "0.11"
+PREFERRED_VERSION_renderproto-native ?= "0.11"
+PREFERRED_VERSION_resourceproto ?= "1.1.0"
+PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_videoproto ?= "2.3.0"
+PREFERRED_VERSION_windowswmproto ?= "1.0.4"
+PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
+PREFERRED_VERSION_xextproto ?= "7.1.1"
+PREFERRED_VERSION_xextproto-native ?= "7.1.1"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.1"
+PREFERRED_VERSION_xf86driproto ?= "2.1.0"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
+PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
+PREFERRED_VERSION_xineramaproto ?= "1.2"
+PREFERRED_VERSION_xproto ?= "7.0.16"
+PREFERRED_VERSION_xproto-native ?= "7.0.16"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
+#util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_lndir ?= "1.0.1"
+PREFERRED_VERSION_makedepend ?= "1.0.2"
+PREFERRED_VERSION_makedepend-native ?= "1.0.2"
+PREFERRED_VERSION_util-macros ?= "1.3.0"
+PREFERRED_VERSION_util-macros-native ?= "1.3.0"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
+#xserver
+PREFERRED_VERSION_xserver-xorg ?= "1.7.2"
diff --git a/recipes/xorg-app/lbxproxy_1.0.2.bb b/recipes/xorg-app/lbxproxy_1.0.2.bb
new file mode 100644
index 0000000000..1303947c27
--- /dev/null
+++ b/recipes/xorg-app/lbxproxy_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+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/recipes/xorg-app/xcompmgr_1.1.5.bb b/recipes/xorg-app/xcompmgr_1.1.5.bb
new file mode 100644
index 0000000000..45f74d33f2
--- /dev/null
+++ b/recipes/xorg-app/xcompmgr_1.1.5.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Compositing Manager"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS += "libxdamage libxcomposite libxrender"
diff --git a/recipes/xorg-app/xgc_1.0.2.bb b/recipes/xorg-app/xgc_1.0.2.bb
new file mode 100644
index 0000000000..2bdb000c5d
--- /dev/null
+++ b/recipes/xorg-app/xgc_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxaw libxt"
+
diff --git a/recipes/xorg-app/xinit_1.2.0.bb b/recipes/xorg-app/xinit_1.2.0.bb
new file mode 100644
index 0000000000..ce82fb05d4
--- /dev/null
+++ b/recipes/xorg-app/xinit_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xkbprint_1.0.2.bb b/recipes/xorg-app/xkbprint_1.0.2.bb
new file mode 100644
index 0000000000..27bbe169ef
--- /dev/null
+++ b/recipes/xorg-app/xkbprint_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxkbfile virtual/libx11"
+
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb
new file mode 100644
index 0000000000..792909621a
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
diff --git a/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb b/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb
new file mode 100644
index 0000000000..a53297fd8a
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/xorg-xserver/xserver-xorg_1.7.2.bb
new file mode 100644
index 0000000000..8f72741387
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.2.bb
@@ -0,0 +1,19 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PE = "2"
+PR = "r1"
+
+SRC_URI += "file://sysroot_fix.patch;patch=1 \
+            file://dolt-fix-1.7.0.patch;patch=1 \
+            file://randr-support-1.7.0.patch;patch=1 \
+           "
+do_install_prepend() {
+        mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "