Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

41 files changed, 747 insertions, 197 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b69b6757db..48e098db44 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -688,6 +688,7 @@ include conf/documentation.conf
 require conf/sanity.conf
 require conf/abi_version.conf
 require conf/enterprise.conf
+require conf/compatibility-providers.conf
 
 ##################################################################
 # Weak variables (usually to retain backwards compatibility)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 994389753e..1cd45c9d1b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -858,6 +858,10 @@ sha256=7bae2d456ede67312e1b34e4bfc277af7331e0eee55b95226de392e2d4fee340
 md5=5e47d51daf090c25635cf2c3597150bc
 sha256=5194ae0f07aaf274e46712cd3f2be553ca75970d2124ac388ce444adee5e2878
 
+[http://downloads.sourceforge.net/project/performous/performous/0.4.0/Performous-0.4.0-Source.tar.bz2]
+md5=d7eafad29a94e3099c849d3c7208bfac
+sha256=4688546a70b09837311e428c233bac091ce5301c7dd4efe21137ca8867af8be0
+
 [http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-1.10.tar.gz]
 md5=b014170483cf85a93d08ee59196c53f9
 sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b
@@ -1054,6 +1058,10 @@ sha256=df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
 md5=c6660feea2a6834de10bc71b2f8e4d88
 sha256=94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
 
+[http://www.libsdl.org/release/SDL-1.2.14.tar.gz]
+md5=e52086d1b508fa0b76c52ee30b55bec4
+sha256=5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
+
 [http://www.libsdl.org/release/SDL-1.2.7.tar.gz]
 md5=d29b34b6ba3ed213893fc9d8d35e357a
 sha256=f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
@@ -1846,6 +1854,10 @@ sha256=a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50
 md5=44e18d01857f9dfeb8628e317e786f31
 sha256=4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042
 
+[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.4.1.tar.bz2]
+md5=76ca1c6e1d8904d2d885f81f7332eba6
+sha256=08069e1b7dd0e357c1ac7fa63aadcae094dc131d2a578eb1600a9bd16b8fde19
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/applewmproto-X11R7.0-1.0.3.tar.bz2]
 md5=2acf46c814a27c40acd3e448ed17fee3
 sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
@@ -1854,6 +1866,10 @@ sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
 md5=420e6cdf38bb771ec8b00228bf09e8ff
 sha256=15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
 
+[http://xorg.freedesktop.org/releases/individual/app/appres-1.0.2.tar.bz2]
+md5=6f2f5d9f41669d498b56d73dc3206951
+sha256=37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/appres-X11R7.0-1.0.0.tar.bz2]
 md5=3327357fc851a49e8e5dc44405e7b862
 sha256=bbc15785d609c7f26176b91d26354ca7bfcc5d9fe72d15a78f2809eeba1cb6b0
@@ -2062,6 +2078,10 @@ sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e
 md5=3e6bcedc549cb4c014227f882969db5c
 sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e
 
+[http://downloads.sourceforge.net/asio/asio-1.4.1.tar.bz2]
+md5=1879b246f9217d64bd3126aa16488bc2
+sha256=aeb5c997940e6afd399c62316f03f480557f2b721354adff065d230183ff2782
+
 [http://802.11ninja.net/~jwright/code/asleap-2.1.tgz]
 md5=eb74eca847fa71ba89a965548526f7ac
 sha256=ba77747cfb107d31cf4ae2eb27839cfa196c0fca08c98465256a4820b9d85d29
@@ -3046,6 +3066,10 @@ sha256=83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc
 md5=98200c358e5401d648b980564d9ae39d
 sha256=863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
 
+[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.4.tar.bz2]
+md5=7d0c1ac193be2491c72a91ccf37ef18e
+sha256=2517aaa015795a348435e4e83bafe7642d4b2fe1976ee982a5d652cf417f79d8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2]
 md5=bbb3df097821d3edb4d5a4b2ae731de6
 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
@@ -4554,6 +4578,10 @@ sha256=e77e1cb6cdeb30367f75accf62a7b94598ece4400c42eb9d8181b7da4fc87f82
 md5=9f99bee77ff3c565b4898663810fbef5
 sha256=11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541
 
+[http://xorg.freedesktop.org/releases/individual/app/constype-1.0.2.tar.bz2]
+md5=83f623f961400ecc56ff52a716308173
+sha256=70375ea6b3e17cabc35492f87b5b138295c8f0258d65b0fbba998e3ff69bb634
+
 [http://projects.o-hand.com/sources/contacts/contacts-0.4.tar.gz]
 md5=7d72fac4f0d6e1c771c37e4e80093e70
 sha256=e090ab64a02e4918f78312df19715bc2008aae7d44f6b0913c2a46a13d1881c4
@@ -5190,6 +5218,10 @@ sha256=24c7887fe896325a6cdc86b8beeb0d9c2de8b1c4cb20f53c2dc8f90963fc39bf
 md5=c0124afc760d4fe8c24ffcf15ba7f391
 sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
 
+[http://www.burtonini.com/computing/devilspie-0.22.tar.gz]
+md5=4190e12f99ab92c0427e457d9fbfe231
+sha256=e06aba1d96889e1b58bd1b0ba4d3015f50adc3ade2824b5cb37a0ee7f2490aaf
+
 [http://downloads.sourceforge.net/devio/devio-1.0.tar.gz]
 md5=3f421c80bce00b8bfe68ef9f453932b7
 sha256=25380c3722c75b993d530c09d48f5941c0a640a4382f6a0e1878c4ee8459dd16
@@ -5750,6 +5782,10 @@ sha256=6d851f4117002d3523354b70c3f9be4abe5325b084ff54d01ac6daa5ce9a5944
 md5=cc101da3b436607ee2265b5af5001484
 sha256=ab7c305be32708c4ede670e13783b718e6a28e35b5495e6c42c31c35a8b512a6
 
+[http://www.hugovil.com/repository/dvnixload-0.2.6.tar.gz]
+md5=33308f47405c0e96a8248c7b1229dee5
+sha256=5b76e9cb0ee843208c17053315926e0e168db8a89fe960655a0d0f4871e2b9da
+
 [http://www.threekong.com/download/dweba/dweba-1.0.0-pre14.tar.gz]
 md5=6f0bd0bcda35c6a96cc3853f16ba82d4
 sha256=ea32ca58b6500d9061177da23ef03f918ef0c5bbbdd082a843f4834cef9c4957
@@ -5930,6 +5966,10 @@ sha256=978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df
 md5=a25f931cc6c8d03daaed434f5db5df2d
 sha256=a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
 
+[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.4.tar.bz2]
+md5=1800dda934ebb7c588ea686278a10e9f
+sha256=d7ce4c0bb214e055cb7680d8b88b9f551610fc40c28269cb51649133862f3302
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/editres-X11R7.0-1.0.1.tar.bz2]
 md5=a9dc7f3b0cb59f08ab1e6554a5e60721
 sha256=1373ded7c35c38e479122ac1fd8a85682a533612538645c79d09992abcbaab10
@@ -7126,6 +7166,10 @@ sha256=168b326dbad59381d0e0a9544d26f1fb8bd23d3b5478fcc426f7ce470ee8a2f7
 md5=aa7ff4bd20b961afda9c15d103b972a5
 sha256=e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc
 
+[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.2.tar.bz2]
+md5=ad945b19b2db64dec3a19507848ff63b
+sha256=8c5f2752e44af6219c1b4cfc178f9721f6dd573039e973f61029136c2756e233
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2]
 md5=db1cc2f707cffd08a461f093b55ced5e
 sha256=0ba76231d9af3422376d9c1652ab3f8614bdd52acc2e2a839d911e1a54b5d5b6
@@ -7206,6 +7250,10 @@ sha256=8d55580d9cf032127bd17b8d4a6bdcdb09392e76fe8ec075ce7472bc3de8e5d6
 md5=ad43cf739b3d46ba1e7dc778a0608a52
 sha256=7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644
 
+[http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-1.0.1.tar.bz2]
+md5=664df71cb510b744b4a10e778445c37b
+sha256=1ce72f84a6c4df7f0e949f915346026ebfeaa5b2e47f7bbc29117ebbf3a7a7c8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-ttf-X11R7.0-1.0.0.tar.bz2]
 md5=53b984889aec3c0c2eb07f8aaa49dba9
 sha256=a268245101a49b1e4c2785a9d809d43fe8564b8243dcf7898a37f25abf4d9edf
@@ -7214,6 +7262,10 @@ sha256=a268245101a49b1e4c2785a9d809d43fe8564b8243dcf7898a37f25abf4d9edf
 md5=46588b22678e440741d6220bc3945cbf
 sha256=5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b
 
+[http://xorg.freedesktop.org/releases/individual/font/font-bh-type1-1.0.1.tar.bz2]
+md5=374d954c61363206c93d1ce7e9445c31
+sha256=da3b5f26c6cde0baf3831f50c79a7a107806f885e0205073855bfbc5a357bb45
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-type1-X11R7.0-1.0.0.tar.bz2]
 md5=302111513d1e94303c0ec0139d5ae681
 sha256=f7cede14e92d83d6c3d36eeb9d3d66fdd60372c39e8571cb9ae40a7d8c5182d5
@@ -7246,6 +7298,10 @@ sha256=71b1b6416e0018ad954225f53c0c9f2eaf8d663e1084657f3cb9b930073b7f6b
 md5=1399dc18aeb9571b0951d9570ea1059d
 sha256=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
 
+[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.1.tar.bz2]
+md5=5b1856a24b1b46414950febc63880307
+sha256=3d231566856c754f48f568f41c15376730d45d9c3ffd37e1d2476097519f22b8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2]
 md5=068c78ce48e5e6c4f25e0bba839a6b7a
 sha256=f44bc571753fd04c09eac7b266d1e0256db9efd0d40ab834920b9dfbb4297d52
@@ -7254,6 +7310,10 @@ sha256=f44bc571753fd04c09eac7b266d1e0256db9efd0d40ab834920b9dfbb4297d52
 md5=6610475e2e231242f8f2122a709c3695
 sha256=4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903
 
+[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.1.tar.bz2]
+md5=a4e8e229a051c0ede9eb525e4006d93a
+sha256=51027cc1d49140153620c1a2b653f1773fe92cb694b221396d68265343e113ab
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2]
 md5=f4881a7e28eaeb7580d5eaf0f09239da
 sha256=f6f09d398a89595bec5825043d36056c0a080aa2d47ae3e52c01a7258119fd6d
@@ -7310,6 +7370,10 @@ sha256=e7ee982884f0c1fca409b6b9a946493afb23c9e61d33ac84ec29819717a66b75
 md5=8e8733051371e2b51123376b49f5d3ea
 sha256=30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e
 
+[http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-1.0.1.tar.bz2]
+md5=1646179ff224b3e2c9b1e7f59042897f
+sha256=887ea895cc0fdd5c50d4960aee7cb6ed813cf90f53b53ce0e0e068dd606cc919
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-ibm-type1-X11R7.0-1.0.0.tar.bz2]
 md5=fab2c49cb0f9fcee0bc0ac77e510d4e5
 sha256=534210f571a2166f3b6d4d8e1c37f74574c0130a4a1ed4c7d37b50a98fc95cfc
@@ -7366,6 +7430,10 @@ sha256=e332497fe6220c019c411912653a96d26c8706c03456ac8ff3ff5ef38b1cc77c
 md5=0b271fc617087d77560bdca20c0cdbb0
 sha256=58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141
 
+[http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.1.tar.bz2]
+md5=4c88c79b8e5d47af90b21e948d42755f
+sha256=bf3b3a994b6c4047b2d79f590e7113ed429b8b7a83992cb753a83e6e8bd3d948
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2]
 md5=190738980705826a27fbf4685650d3b9
 sha256=04025084b8f4e7559e34938cab9a70b28cad8174ef5f5f6103abd633b54048d9
@@ -7374,6 +7442,10 @@ sha256=04025084b8f4e7559e34938cab9a70b28cad8174ef5f5f6103abd633b54048d9
 md5=ccb212a7badf7aefdc9f9a92af428d32
 sha256=c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924
 
+[http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.1.tar.bz2]
+md5=345f1a78312e30cd2c41d24ea3f3276f
+sha256=5366d7a0f38a189e504676a9cddd8430113f9957919f0a3dc181bcaaaed92618
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-meltho-X11R7.0-1.0.0.tar.bz2]
 md5=8812c57220bcd139b4ba6266eafbd712
 sha256=cacbf0c055b95db07e4e61716a549195f6ed054ba98d0b443879f57876ca253d
@@ -7494,6 +7566,10 @@ sha256=ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d
 md5=d7e965776c7f0c30b0f09742176fb77a
 sha256=8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341
 
+[http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.2.tar.bz2]
+md5=a966f5a8aade9e63af86d8a6bf3e8586
+sha256=7a026aeaafe5a619b2c1b35cd361125b169b2212eaf0f2f5ce796038b1cf06cd
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2]
 md5=27a6bbf5c8bbe998ff7e8537929ccbc8
 sha256=cda4fed7e7d462257f7282db3459fa94f94ab70934a401b7a90f5decb044f94f
@@ -7502,6 +7578,10 @@ sha256=cda4fed7e7d462257f7282db3459fa94f94ab70934a401b7a90f5decb044f94f
 md5=60df6b625074a9790e28543dcea71651
 sha256=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9
 
+[http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.3.tar.bz2]
+md5=a8a50e5e995bfacb0359575faf7f6906
+sha256=1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fontcacheproto-X11R7.0-0.1.2.tar.bz2]
 md5=116997d63cf6f65b75593ff5ae7afecb
 sha256=72a6200a586f27c55b837cc6e537f15499a2f07783a826521c9ad2eaf35a6461
@@ -7606,6 +7686,10 @@ sha256=44b7e18ba9ae5667dd64c89f7b04627bda5807a3a90255a125702d63c0c4ee17
 md5=d5e8be59e307cef76bc479e1684df705
 sha256=9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/2_25_00_04/exports/framework_components_2_25_00_04.tar.gz]
+md5=11410b5cf4142ae415b683af0e9929b5
+sha256=161432f5cf184f96de290f807a4a6fddf11f2612d5b2efd91f8187c0ac612a40
+
 [http://downloads.sourceforge.net/free42/free42.tgz]
 md5=1fc21e04b3b77150846027dc7cb5210d
 sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a
@@ -8306,6 +8390,10 @@ sha256=ccff6cab0e847c486d30b70bdddac4e6646bafcecaa3b63134d6e3d4d5a4b91d
 md5=1d1b1d5c0245b1c00aff92da751e9aa1
 sha256=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
 
+[http://gdevilspie.googlecode.com/files/gdevilspie-0.31.tar.bz2]
+md5=a414f4ed6c2ab135b9be3d2cc27e3c4d
+sha256=1e677b41a6f3f256f759a48f92c613e68dafc3c5a2586230c61591481faf76b2
+
 [http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/gdm-2.14.9.tar.bz2]
 md5=7e46bc3b0a5b08e79f1f2f1b869caf40
 sha256=0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2
@@ -8674,6 +8762,10 @@ sha256=f921da7c8beb396278591b5ca7159b432a38902f1f872c4ae2d40aeb38f9cf01
 md5=cacbcac3fc272dce01c6ea38354489e2
 sha256=a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
 
+[http://downloads.sourceforge.net/project/glew/glew/1.5.1/glew-1.5.1-src.tgz]
+md5=759a59853dfaae4d007b414a3c1712f2
+sha256=89e63d085cb563c32a191e3cd4907a192484f10438a6679f1349456db4b9c10a
+
 [ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz]
 md5=6fe30dad87c77b91b632def29dd69ef9
 sha256=6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
@@ -12174,6 +12266,10 @@ sha256=754038a9eb8f1d0d6559d5b124a68e1e530a76366cff251d79536ec89e2fda21
 md5=7ab8b64edf0212a9d9a3c8129901a450
 sha256=06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb
 
+[http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.3.tar.bz2]
+md5=975ade3f238c1eb10705da0a91e6e8e7
+sha256=abca3ff6c9f2da2600a474f0e92ae5e62c43914f7bd3d948b91b0a7f9117d81e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/iceauth-X11R7.0-1.0.1.tar.bz2]
 md5=92035bd69b4c9aba47607ba0efcc8530
 sha256=46a02c0dddbe80fbd802da47d0a9eac03002deb538b109dae804553fbbdfa7bd
@@ -13322,6 +13418,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
@@ -13430,6 +13530,10 @@ sha256=ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e
 md5=d58b5a03ba36c661ff48f38048c2edd3
 sha256=82f9b9dff544fc3d8bcda5878930cdc3817d478f34b3790c599fe185c138f160
 
+[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.4.0.tar.bz2]
+md5=75e27245bc15aed845fe0505f4f21ca6
+sha256=c8e92616ad465ce2ae86360ff216a9711bdd1156dbb06af6d86009c6773e1c82
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libAppleWM-X11R7.0-1.0.0.tar.bz2]
 md5=8af30932ebc278835375fca34a2790f5
 sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
@@ -13442,6 +13546,10 @@ sha256=2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
 md5=81521249353fa33be7a4bb0062c2fbb9
 sha256=9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
 
+[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.2.tar.bz2]
+md5=ecf2d6a27da053500283e803efa2a808
+sha256=af2a5fe5eaa2b026e10bddb4e3f39976dc13deb5dbdc714abe1f016435ce3049
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libFS-X11R7.0-1.0.0.tar.bz2]
 md5=12d2d89e7eb6ab0eb5823c3296f4e7a5
 sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1
@@ -13518,6 +13626,10 @@ sha256=efde1a974723b9a0bf3c731903766bce9dd1ead3d0550eb2a4f2396d7b402e17
 md5=337b379fd00a67345b083100c4e6ba95
 sha256=6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libWindowsWM-1.0.1.tar.bz2]
+md5=274b2b5620a524fd7bb739edb97317f5
+sha256=25f07cf847cbe91d36c20f348b4b9494c4504fe02966e8cdf65cf56316a70edc
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libWindowsWM-X11R7.0-1.0.0.tar.bz2]
 md5=d94f0389cd655b50e2987d5b988b82a5
 sha256=76ccdb6adfc51a4c40e90fe66f599ee4de4787fca44860b851dd4bbf97f7889d
@@ -14098,6 +14210,10 @@ sha256=b3bcacd212b1aac947cdfe7e64175255f0302bc5a461e2c8925e3cf491532b10
 md5=b54600573daf9d1a29b952e8d35b389e
 sha256=1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.5.tar.bz2]
+md5=16c3a11add14979beb7510e44623cac6
+sha256=0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXvMC-X11R7.0-1.0.1.tar.bz2]
 md5=c3eb4f526f08862489355a99e3eda1bd
 sha256=fa18853a6cb877e59433fdc1455e5b7fde9bd47c617d97208c7e3e32ff84d774
@@ -14366,6 +14482,10 @@ sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef
 md5=866fd13611a8de946428db1df9be8468
 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7
 
+[http://libcli.googlecode.com/files/libcli-1.9.4.tar.gz]
+md5=b917617d21b90db214971efe64a33416
+sha256=c1e56ff2e55a879b7c89b5808aea76063512d9a24cffd601aa3d9a84cd6a7928
+
 [http://repository.maemo.org/pool/maemo5.0alpha/free/libc/libconbtui/libconbtui_1.4.1.tar.gz]
 md5=68ac3177685c577aadf8d2e9f47b1878
 sha256=c3540df46bd9716c6a6f521806c70ae548822a5e62d245900cc28b5fa9fc3eb3
@@ -14478,6 +14598,10 @@ sha256=9422e73c55aa921fbbce06e5e01bba0b98bb7a0f1640c27cfd307c290dba792c
 md5=6c5b6fff276c3a1171ceb41c6d4b6e34
 sha256=76866075a54aa04f4f18f2cf09cf19c84dee4ed22c45b741dc4067f5e224430d
 
+[http://www.des-testbed.net/sites/default/files/libdessert0.86.14.tar.gz]
+md5=7c9f9ecfcc36217ac2af3dba7828e284
+sha256=4cea899ab0fc3d96a6ba1e5e7e28253636f4ceb3ed3cba88da4cbaa328e42285
+
 [http://handhelds.org/~paxanima/files/libdictionary.tar.gz]
 md5=10ee733c70e96e8e9f01d3de2cc0c78c
 sha256=46f0a85f340e099e9010c8eb9a28d727830aedb32be48fe0a2f0cd081e0623fd
@@ -15770,6 +15894,10 @@ sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
 md5=757371e21e4f3653ce4d12d3ba0be1e0
 sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a
 
+[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.2.tar.gz]
+md5=42ab7383c4ca4093000ec7062289112b
+sha256=dc5d3cf256390d5419ea7dc3fc35761999a1da99fa4b645ac3e92a6a279c38fc
+
 [http://ftp.gnome.org/pub/GNOME/sources/liboobs/2.22/liboobs-2.22.0.tar.bz2]
 md5=1b090ecd6c0df58b131795ff9a5c9057
 sha256=b35760855d7d1def532e9e808cecde29b75cec455b238590072abf4a8206536e
@@ -16010,6 +16138,10 @@ sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
 md5=b8b8d09adf6bee2c5902c8e54c4f2e68
 sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
 
+[http://downloads.sourceforge.net/libpng/libpng-1.2.40.tar.bz2]
+md5=29bbd1c3cbe54b04bfc2bda43067ccb5
+sha256=a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
+
 [http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
 md5=00cea4539bea4bd34cbf8b82ff9589cd
 sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
@@ -16974,6 +17106,10 @@ sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
 md5=ed40cf4088c306400b005bbd63ac36be
 sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
 
+[http://mirror.lihnidos.org/GNU/savannah/linphone/3.1.x/sources/linphone-3.1.0.tar.gz]
+md5=ed40cf4088c306400b005bbd63ac36be
+sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
+
 [http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2]
 md5=d74fc9ea01384bead3925434b932d6b7
 sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69
@@ -17294,6 +17430,10 @@ sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade
 md5=de958cdb8d00e74792dd69f3c945b037
 sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/linuxutils/2_25_01_06/exports/linuxutils_2_25_01_06.tar.gz]
+md5=15486b27c9960f06b53f8a60e90f941d
+sha256=61b86cdb5c1b2f9eb766fece6ea5ae89f29cf84d0c3eecbcc9b5d0ffd42d2bcb
+
 [http://gpephone.linuxtogo.org/download/gpephone/liblipsevent-0.1/lips_event-0.1.tar.gz]
 md5=1fd0f41f9676ef0c882921bc37628d07
 sha256=7182cf3f63e11e7ea6c6a994f9e70ef3bf6e430a5db643f5b29a0fd0996ddfd5
@@ -17650,6 +17790,10 @@ sha256=c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
 md5=b01e4f71c20fc1c79ed727759c1df40c
 sha256=2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
 
+[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.4.tar.bz2]
+md5=4e45233e310d72dce307709761cf241b
+sha256=d11cd500975f652060f89d79cb8034011d99ee9aa6c82951680fc0621ecb8252
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/luit-X11R7.0-1.0.1.tar.bz2]
 md5=30428b8ff783a0cfd61dab05a17cfaa7
 sha256=fb423dc3ae75e64a256172c873732fe869ae482409cf1f3e7d980d222f070cee
@@ -18050,6 +18194,10 @@ sha256=16ff3ea972065925338da1a1f37322dc4d8774f6d34d2dde2ce85121c08c99e0
 md5=90f5f3b987497a481b94d49372f17dce
 sha256=0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61
 
+[http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.gz]
+md5=905bfeb1a59929d950e5d638fbadcf39
+sha256=008e6e117372e04cdc9a72ffc7dfae2e2d6617c9b399e052ae12dc2a1a03079a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/makedepend-X11R7.0-1.0.0.tar.bz2]
 md5=7494c7ff65d8c31ef8db13661487b54c
 sha256=1caf464a967ff9335a040f2d3ffe050c881efda13c14531be49cf1aa8dabda92
@@ -18670,6 +18818,10 @@ sha256=7fbadfa5cb38f7d754214b792854c4a0cb32fd1c9b5ae8ff05434cb3b3acbe01
 md5=912e6305998441c26852309403742bec
 sha256=25cba395022c878cf0323da5b2b4aba1cca03001311a4e2d7632d6a199806294
 
+[http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.1.tar.bz2]
+md5=25b774e1b64833d0cdc00663931efc73
+sha256=c9ee54d18cb9a8a0c5fcd8d2dd08ed8ed869f3a538af46caff08ca9bc9cf2caf
+
 [http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.tar.bz2]
 md5=c8237b4aea1ae0c15441deab6b12c5c0
 sha256=8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
@@ -21338,6 +21490,10 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
 md5=e6029fafcee029edcfa2ceed7a005333
 sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
 
+[http://us2.php.net/distributions/php-5.2.11.tar.bz2]
+md5=286bf34630f5643c25ebcedfec5e0a09
+sha256=9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23
+
 [http://us2.php.net/distributions/php-5.2.5.tar.bz2]
 md5=1fe14ca892460b09f06729941a1bb605
 sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
@@ -22982,6 +23138,10 @@ sha256=272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc
 md5=61784f1bcac80f18f468b8dd013eab4f
 sha256=9cfe0418699e231587182b441c8f6ca68f109059c62bfc8dd9daeafb8277d211
 
+[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.0.tar.gz]
+md5=2a7b5126f2450d8525af355fc4c12ad6
+sha256=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
@@ -23530,6 +23690,10 @@ sha256=b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752
 md5=99aea04a27197056368a4431f30f9cdb
 sha256=02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
 
+[http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.3.tar.bz2]
+md5=e09c14cf1ac78260f95a9aa45bccab4c
+sha256=d6ee7becf9ece2fcc30ce50f7e9be31f231cce0cb3a8ba09d1697ac2822c3fcc
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rstart-X11R7.0-1.0.1.tar.bz2]
 md5=6f33a1bd8e99372b7544ddfcad456369
 sha256=d662e932154df4d99ffcf29cd1efe5adb7b0eb1841ccffe9155b9c5d8055434c
@@ -24110,6 +24274,10 @@ sha256=7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc
 md5=839e968d7197b9563f0fd8a5a3aac2e3
 sha256=23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
 
+[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.5.tar.bz2]
+md5=00e834c3cbfd990e9d7d5ddc834242df
+sha256=3308fbd0018d53bb818fee9de1cde484965b740073d5d240efa4cfc881c9d1a9
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/sessreg-X11R7.0-1.0.0.tar.bz2]
 md5=8289a5b947165449c23bdfad9af02b4c
 sha256=3769ad5059a2841a8ee28fc8a7d3a3ca8eb59f4fd46d0bd629829f3841202734
@@ -24174,6 +24342,10 @@ sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
 md5=6fab3bb176be9e510c5613d054ef1ca4
 sha256=9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
 
+[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.1.0.tar.bz2]
+md5=2f902e0a89aaf2b19e06e7f26c6efb3a
+sha256=932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/setxkbmap-X11R7.0-1.0.1.tar.bz2]
 md5=28b141ab0b1c44a5e90d31ad73bd1078
 sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b
@@ -27190,6 +27362,10 @@ sha256=00b2384e225d6a1cbda4994c63103ac229269bb2946537e9357655e5c5b84333
 md5=ed5416cf7e2ba6e66641c88f12768c0c
 sha256=780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151
 
+[http://xorg.freedesktop.org/releases/individual/proto/windowswmproto-1.0.4.tar.bz2]
+md5=e74b2ff3172a6117f2a62b655ef99064
+sha256=c05bb0edb627554fe97aa1516aed44accf6566b1db0e50332689a24afcebd26b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/windowswmproto-X11R7.0-1.0.3.tar.bz2]
 md5=ea2f71075f68371fec22eb98a6af8074
 sha256=e575dc15f7ac3bd4dd4241be617bd88806506cf6ff1fc9332a42ae2275a5118c
@@ -27454,6 +27630,10 @@ sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
 md5=43cbe5c7508f7dc3e141c346a897fbe7
 sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
 
+[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.bz2]
+md5=0461c2085ac1ad7e648aa84c4ba51dd1
+sha256=b84617a2fd219153a6df95dc7f4aa1ba9c07af5859a3d00fc23f9aaed2a1e3d5
+
 [http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.gz]
 md5=05b32ca051651f4b1885a90f62969faf
 sha256=4a65573bc12e15b21a4acdce89e7e6b71edbe214817457f90fcf855220bafe66
@@ -27566,6 +27746,10 @@ sha256=019578691e8ab02532e35033331e275b658b360033e9e34dfdecf4774d161e3c
 md5=8d2731e6e95f173f41a0ddc875d55804
 sha256=d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8
 
+[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.1.tar.bz2]
+md5=3e39eec6d0fd5c587ca6d55aa7bb8fe1
+sha256=5d32d891c83b9c0089231f4f1c424ab02301b627ce26e5c2e6e397b8ea606fb2
+
 [http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.tar.bz2]
 md5=51b4a1c0ae2b3bd77417306fd78a3e94
 sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
@@ -27666,6 +27850,10 @@ sha256=b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45
 md5=2c6ecedb10dc51adbb64c95f22fd99c2
 sha256=3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
 
+[http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.0.tar.bz2]
+md5=113eccea3ee73a1ef7b43d2291ca1e09
+sha256=de0f37c7bf69c3aac3362bc0cbe470a622c2a85b62c5483c113ea88512232710
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclipboard-X11R7.0-1.0.1.tar.bz2]
 md5=a661b0f922cbdc62514bfd3e700d00fd
 sha256=74e949dc0fc1d275b60a170975a9bb99a12153687f2a3478b963b1ae4c607d96
@@ -27678,6 +27866,10 @@ sha256=ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d
 md5=2b1a3d030d87e62a591db8ee4c0072e6
 sha256=10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f
 
+[http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.4.tar.bz2]
+md5=bb9fd5e00d39c348a0078b97fdf8258f
+sha256=69b903b6305211c9fc5db394f3d08c0a696aa51942d73db7f594422e7be6edf0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclock-X11R7.0-1.0.1.tar.bz2]
 md5=00444fed4bf5cd51624476ee11dd1fab
 sha256=eb93d5278f5e46f8d7ff5b53a10a03fef09326e72966c3a0b8faa255436ee6b9
@@ -27714,6 +27906,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
@@ -27738,6 +27934,10 @@ sha256=e0dd4b753690c650c6bfbb5af9d190fa6bb3d889a491c8553a34ba397ede8bbc
 md5=014bad415e64c49994679cdb71a97e37
 sha256=4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
 
+[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.2.tar.bz2]
+md5=e8929a1bb4d98d1a3991fd340d0b5f09
+sha256=5f798c2f1d2794c09fa0a40700c40359b725107608012866828015dca47514d6
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xcursor-themes-X11R7.0-1.0.1.tar.bz2]
 md5=c39afeae55a7d330297b2fec3d113634
 sha256=730029a4f23661094f0d246595041e51ec0b55e7405fcd5affee1ec7f9aba813
@@ -27770,6 +27970,10 @@ sha256=8290616302932e72d4224cbe27d872efa5f44b0b8553ded0bbfb3537abe76907
 md5=59d8d79fb950a55722c0089496fd18b1
 sha256=ae38043c9dbf99a516f4edc58ef6235ceba975d8b5f374244a2b3e96793d7d5a
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/6_23/exports/xdais_6_23.tar.gz]
+md5=09b0a14b9f8fb98686a98857eedd10a1
+sha256=12e60870930d9392c37dabdd25988e6dd5fb66ce0fe1e3b0d72250c90c8c26b7
+
 [http://xorg.freedesktop.org/releases/individual/app/xdbedizzy-1.0.2.tar.bz2]
 md5=ecef9cfd197d00980e0d69ee4126d890
 sha256=74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
@@ -27790,6 +27994,10 @@ sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb
 md5=c7cd094cdc49459018b6f0e1eb95af30
 sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15/exports/xdctools_setuplinux_3_15_01_59.bin]
+md5=c7cd094cdc49459018b6f0e1eb95af30
+sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
+
 [http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2]
 md5=b3884eaec59a63691f66bc29ce57a56d
 sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22
@@ -27834,6 +28042,10 @@ sha256=6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d
 md5=cc1816bc62a3722ad509373b0b7f30fe
 sha256=e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
 
+[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.9.tar.bz2]
+md5=030ae4bd9b8d428749d68bfdf56ce8a5
+sha256=e7b1db0e1b0d0113a301d94e40b0314e55f7e0006415f50a9cf06f636b11b134
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdm-X11R7.0-1.0.1.tar.bz2]
 md5=9ac363721dbb8cd39aa1064b260624a6
 sha256=9bf8895b98fb35ee38ac713ce83c80abdd8e33de278e1ddf982a293c31b56b81
@@ -27882,6 +28094,10 @@ sha256=9049146404b9596d70f77a0250d26aff93ba7ba6f42e99f7ee2302a757dfd362
 md5=c56160e93c24ddf17e69891ed50deb72
 sha256=2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df
 
+[http://xorg.freedesktop.org/releases/individual/app/xedit-1.1.2.tar.bz2]
+md5=67193be728414d45a1922911e6437991
+sha256=a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xedit-X11R7.0-1.0.1.tar.bz2]
 md5=19f607d033f62fb1ee5965f4236b19d4
 sha256=cfbea0872e9963ae3ff61b07000f92d840b65244eec0e1a9750a58a03d70db93
@@ -27942,6 +28158,10 @@ sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
 md5=033f14f7c4e30d1f4edbb22d5ef86883
 sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
 
+[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.991.tar.bz2]
+md5=ba1b886bd6104018fe78ab431d83ce4d
+sha256=594324114bb20a502102a9a584dfa5c63d85aa60b7975fd7587d82d42c8ef115
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
@@ -27958,6 +28178,10 @@ sha256=07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a
 md5=2d6596b2b0cfa527b5ed4df2014684bf
 sha256=953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.4.0.tar.bz2]
+md5=51247dc0d73185e35bec326283bc49a5
+sha256=48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2]
 md5=b35b1756579ebe296801622bdf063ab1
 sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea
@@ -27974,6 +28198,10 @@ sha256=3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a
 md5=2aa75313ea5652a8cf93581c65ee6493
 sha256=219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.3.0.tar.bz2]
+md5=ae3ec07aff6c156cf5307f53feb6b293
+sha256=b37f35bb021dffc337c731bfbbb6ce7c0953dc69f7c660cbe48b0f84a07b5e5c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2]
 md5=9ee5109ef33e281ce0784ad077f26cee
 sha256=62d1dfdc2f902d016999861ec3fd58b4630341e8f4df45e65c7bee730b51fd8e
@@ -28010,6 +28238,10 @@ sha256=26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe
 md5=4e254fcefb3bea55772e63c12570f6d9
 sha256=1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.2.tar.bz2]
+md5=8cad35da16ea4688ebb74533ccc7f190
+sha256=6d1908d1f1be1ce94fdc946f47d163c45b0a1fc4b9ffb05cc436bac865e1ecaf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2]
 md5=62b5405d337bc055bc9345565cc0da8c
 sha256=fbac5de06334b6757d91fcc2abc08e2c56c7a57dcba1abdb5c99133decf7f795
@@ -28150,6 +28382,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
@@ -28170,6 +28406,10 @@ sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8
 md5=0f3e013d5ff58e0aba3d9e1d18830291
 sha256=87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.3.0.tar.bz2]
+md5=e5bfda480f25121e3c4222e5e1eb5880
+sha256=d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2]
 md5=fc0e11fefc322623914a2d819d5b6d51
 sha256=8f131c2b26b1e0e16e9dfacc73d457bb16cf6e455a1dbdc382f4a3e3b219c703
@@ -28186,6 +28426,10 @@ sha256=d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493
 md5=175c1e1ad668ebbbe212c1e975dd14f9
 sha256=689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.3.0.tar.bz2]
+md5=c50d0da3206d18d9d94f720e3688eca5
+sha256=e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2]
 md5=0c4f2a6390e3045e4c48a48b47b6332c
 sha256=708011ed8fdb6d321e7ca91787ff06c7bcb011cc4a3b5d6c0c02562222da7ef4
@@ -28222,6 +28466,14 @@ sha256=1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce
 md5=e48b99e55093525ebb7811a014391a0b
 sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.4.99.2.tar.bz2]
+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
@@ -28358,6 +28610,10 @@ sha256=cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea
 md5=50711d390d2867e3fa7e06b59b2d575b
 sha256=214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.1.tar.bz2]
+md5=f28998cdfae2a4c41589299a4ee1f459
+sha256=53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2]
 md5=4758e667bfbba517df2a58d51270cfe2
 sha256=f46f328c9d8ef4dd6fe118121831ff4cd34ea9f06b198f548af4c703a1aab771
@@ -28394,6 +28650,10 @@ sha256=fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a
 md5=24594c0222e631fedccc7c540c420b03
 sha256=9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.4.0.tar.bz2]
+md5=d5f1395b2dcefc7533ff5580e63f2066
+sha256=8cb15e9a30f3602d22eba6c7bcca2c1040889ed0851c7b575273671c2da1bff1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2]
 md5=065b1cf862864741aebcfefcc7c09539
 sha256=314492cea0998182623f2a67461d64df00b910acd052c3a50f9349ead740151a
@@ -28438,6 +28698,10 @@ sha256=57460dfa0429c58d598f192aa65661300dd104953073d977ad4f4b15a596eda8
 md5=939f1c831c5cd3a6f027e982592dfc5b
 sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.0.tar.bz2]
+md5=2cf0a2b0b3006bcfcd85bb77d966244a
+sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2]
 md5=be8a4bd474ad6c85b93f66dd6fcfa6ee
 sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727
@@ -28494,6 +28758,10 @@ sha256=b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4
 md5=862c230f5f6e0c545f232b4c0fa9537a
 sha256=dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.3.0.tar.bz2]
+md5=53bdac9ca56418f4675810ed8a78b3e8
+sha256=e2165ddf637703e21b3c45d83d56485c39b082b9440053d3885557c4d52b130f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2]
 md5=c7ae53dee1f3e95fa5ce9659b34d8446
 sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e
@@ -28510,6 +28778,10 @@ sha256=09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec
 md5=4f78650d79656dc803a720049d65682e
 sha256=f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.2.tar.bz2]
+md5=48441a19aaf015570b267f2a8e67d8ab
+sha256=678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2]
 md5=323911ab16a6147d3cabceff9336a3d2
 sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78
@@ -28526,6 +28798,10 @@ sha256=e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7
 md5=6826c556ebe9a1248cbc7f7edd44f956
 sha256=8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.2.tar.bz2]
+md5=4745f5c722b030962cc56eb2443894a0
+sha256=db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2]
 md5=342937e275dbc92f437417a3186a8222
 sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548
@@ -28542,10 +28818,18 @@ sha256=b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8
 md5=b415bf3259ad0acdaf62e3dde76e3289
 sha256=9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.89.9.tar.bz2]
+md5=619f6ff15db869be3800bb001d5b0468
+sha256=880f16d32a373a052515f4ae28a3f1a97543d0d73d2ea5d74baf23bdc3a6b401
+
 [http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ast-X11R7.1-0.81.0.tar.bz2]
 md5=ac1595de8397efd740038994b1e9ef67
 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.12.4.tar.bz2]
+md5=e662348f6f957fcedf52818d668ab9f5
+sha256=cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.193.tar.bz2]
 md5=102b781f543213852401f3422b18ccc7
 sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae
@@ -28582,6 +28866,10 @@ sha256=16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494
 md5=0fec6bee65383790485d917247a61629
 sha256=05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.2.tar.bz2]
+md5=a3969c28c3b36ab2caa852a9324e9b70
+sha256=ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2]
 md5=90f23505faceac30d3f46ab94f7293e1
 sha256=2df2e34dc61907fb3c41b4590f51d39f951d2d74422d84f1f7d53ef6f5b25352
@@ -28638,6 +28926,14 @@ sha256=46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910
 md5=3d96297556846bee02a74166ffb5d052
 sha256=5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.2.tar.bz2]
+md5=2a6f1f07462fbe336865068cd69c8593
+sha256=9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.3.tar.bz2]
+md5=3ffe3a28f4452e66bf56180e7da9cbc5
+sha256=df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2]
 md5=462654f9be7e3022f97147e3390db97a
 sha256=f50f6d3d7fd79c5ce40ea6039a2fb82f136b13c18afbc2b7e941d41d6568b698
@@ -28698,6 +28994,10 @@ sha256=a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419
 md5=6d7afdac0a26cf201c3f3b417c31c5e1
 sha256=161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.4.tar.bz2]
+md5=960df34e129faa411e58c0d6b56d79a3
+sha256=5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2]
 md5=f14c2f1696c05760207adcaac856e5e5
 sha256=d5b4cb7b490edc3be57c40a00299002b60b8060396b3c902b2bf92090fcbd940
@@ -28726,6 +29026,10 @@ sha256=62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7
 md5=3b170a6df5114420cd4021a057918a09
 sha256=49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.3.tar.bz2]
+md5=a597e8efeec6ab8bc6ba6d87fceb2dba
+sha256=4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2]
 md5=078eed8c3673488ee618dfc7a3ef101b
 sha256=543d7b8bc0c9e7889c686a647f98641f0a9b052e58321a8a17518d680e6db95a
@@ -28742,6 +29046,10 @@ sha256=b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5
 md5=d0e5a805c546b29b1dd3b55a68d16dc4
 sha256=59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.2.tar.bz2]
+md5=4ac1318788f62159965f15131c869e7a
+sha256=48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2]
 md5=625448b13ebe2a13b7defad1efec05c4
 sha256=b0f2f2dd17bd01018fa91d042214b596f9d2303a81a0b86de102400b00f87d09
@@ -28802,6 +29110,10 @@ sha256=95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
 md5=6081b8fa50c689d51f85c2fbaf93867e
 sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.2.tar.bz2]
+md5=6c0522b2b72a0a47c48d718443616651
+sha256=b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.1.tar.bz2]
 md5=ba373233a7d13084d14046a17b02e248
 sha256=5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564
@@ -28814,6 +29126,10 @@ sha256=c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6
 md5=11066b84b949cd04300ec819c9c51532
 sha256=d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.100.tar.bz2]
+md5=3e80cfb84b62866d2f94774ecbf3e46c
+sha256=e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.99.tar.bz2]
 md5=29785ff1de2b0f7b7f1c48350449447c
 sha256=82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c
@@ -28834,6 +29150,10 @@ sha256=d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86
 md5=a72f57fca4f4dff9a2c82eb1fe7456f4
 sha256=96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.4.tar.bz2]
+md5=2d722ee9b9fe8da49109f280689c9c25
+sha256=434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2]
 md5=ffe9015678a41e97bdbd2825066bb47b
 sha256=cfaa594be277cd2a1bf9d796bb398e07319e9b34cff306b408145a37925dc97f
@@ -28846,6 +29166,10 @@ sha256=2f3ba4a6775c66de2b269179a219bf1fcfee85c74db273c85784d80209e1ce81
 md5=2bd8e5b9ea68e0dcd80dfcaca0eff82c
 sha256=66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.3.tar.bz2]
+md5=923baa1ee0429f03ed19ec0be6a4f62b
+sha256=e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2]
 md5=d74d9896d57c3caf224ba3472630d874
 sha256=88d4b58efd0dca626e926ce6dc531026c8a10e7126f2e6544e31a2fc00001c67
@@ -28878,6 +29202,10 @@ sha256=97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e
 md5=42f12a36d7afc26c817e8e8f5c8b7274
 sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.15.tar.bz2]
+md5=1b22188bd9012a148206940708b52ea6
+sha256=c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2]
 md5=f9b38e24157c3aac6014119ac18d76da
 sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952
@@ -28910,14 +29238,26 @@ sha256=f645da4120b3ad5356b46269ae13ef8e2315bbb443a8c147e05c611f7fa21df7
 md5=c0820787e89958c9114d359b6a3cd464
 sha256=b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-0.2.904.tar.bz2]
+md5=f2481d98ef54febf5bffbb88a2a2426d
+sha256=c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.0.tar.bz2]
 md5=007bec0c6b07d9d3aeca4da18e561efb
 sha256=5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.1.tar.bz2]
+md5=2b90854a62a4d45d652062f582dc8d13
+sha256=517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.2.0.tar.bz2]
 md5=6a932ec17da9ce5a6d9000c1649c3a7e
 sha256=87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.3.0.tar.bz2]
+md5=7b6641aa9d836f1621b9b220ad6771b8
+sha256=5adad675e60e973f2e3522a01457d9214157fbb5005090fe48092e6e5e698ad5
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.1.3.tar.bz2]
 md5=a8b97feccb32184820d5856fe78d34db
 sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
@@ -28926,6 +29266,10 @@ sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
 md5=7c03de3804d4c4f6ff59f74050d24b2b
 sha256=b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.3.tar.bz2]
+md5=9a0a916fe1e7b5c81cd4c80a08e646cc
+sha256=9d5559fd3029feee5af2493ab8f558c58c426fc89776a1109dab97e3a4764d94
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2]
 md5=f1a25db74a148dea45115e813027b932
 sha256=4ad42c65f60bc7f3f37f636eae5ae5a9049cdd4df5c546f93f201fdf16213f48
@@ -28942,6 +29286,10 @@ sha256=4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97
 md5=d05e7c3cb044437eda8663e174ba913c
 sha256=ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.3.tar.bz2]
+md5=5eb06d88533fb327d067928faeb20860
+sha256=ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2]
 md5=83b9e8a9b8fc1c49bda2811358e5007c
 sha256=3e11f78c39eb03fe4b9e6a2b68347420297fa38cd36f42235ee4be9c87175103
@@ -28954,6 +29302,10 @@ sha256=b9b9abdd80c00782ca2e1313016c3d3904dc10a1de1c94d29cd4efafeb1f52f3
 md5=4a293047e988d4ea1e9e96d3b5793f43
 sha256=9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.4.tar.bz2]
+md5=6517bbbf808c700502d51acdc44662f8
+sha256=1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.9.1.tar.bz2]
 md5=a91c73285ef67ee7cd9e2da28acb6cc4
 sha256=cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822
@@ -28978,6 +29330,10 @@ sha256=f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5
 md5=62b8aba48b54eaefeae87df502bf219c
 sha256=adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.1.tar.bz2]
+md5=66c319f610e3699c3de0f3ef630abb32
+sha256=2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2]
 md5=6b638dd500d10dba1822d3ea5061fc65
 sha256=e4ee3af5989cc9b0c8ff59082f64a564420dc22a2eb9fd53e41da24260a65e98
@@ -28994,6 +29350,10 @@ sha256=54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7
 md5=a8419a8ed17b02b2a6dd4d30d5e94b00
 sha256=cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.3.tar.bz2]
+md5=29fb322cd3adab52cc7f1ac86f9315bb
+sha256=ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2]
 md5=957de4e2a3c687dbb2e9e18582397804
 sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f
@@ -29010,6 +29370,10 @@ sha256=bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40
 md5=9f57c2f5ccbd8340db32da1c74083771
 sha256=11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.2.tar.bz2]
+md5=f04baa307e49e9f0e5a5c3d2e89a5576
+sha256=3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.3.tar.bz2]
 md5=e35d817fa4ee7beb6cd5aa744b9c0783
 sha256=898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6
@@ -29038,6 +29402,10 @@ sha256=76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a
 md5=42069e70578bf3fb353cdacad186f6c0
 sha256=b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.3.tar.bz2]
+md5=be59e9c2d9458cee0b5006549c14a95d
+sha256=1df9a90ecc31d5fb63de7c970555f166dab24c0f633b54aaac4ee82fa7b49bb2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2]
 md5=781d726a0ca54b65521e383ab99043c8
 sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3
@@ -29062,6 +29430,10 @@ sha256=aa656c99ff6ba9c1013b6060c92bbcda2c30ceff72ecc49139c65eb935844f43
 md5=9e25784e912cb2f0493b87431fd60773
 sha256=1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2]
+md5=8e4bd0a6b155cb861356e7430d667aee
+sha256=cb43007920394b000be98ea0eac16a1cc16b4ca7ea8532b5d803a0c7574720d8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2]
 md5=8f3a734d02ae716415f9c6344fa661bd
 sha256=809a8d57a49c07991d350d4bff955656256afa2c99978050d2aa320d071ef52d
@@ -29074,6 +29446,10 @@ sha256=f9a1ee987c554607c6fed4ae27adbf75c825d628fe522802a717429a85327487
 md5=b9cb8cfb6a4234bebc434f744af53208
 sha256=3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2]
+md5=bb6c4def5cfb0959b72dccb661473d4a
+sha256=d56fe98c34f2af1b6424e3fcaa22a31402a4b59d63679f0e5fdfb1d2ea878419
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2]
 md5=799a54cef1f4435e00fa94a1d97d056f
 sha256=31831c2f44e7d28c928d816c2c5074cc0ec1f0cc83994bf28e46c7f840ab8866
@@ -29086,6 +29462,10 @@ sha256=9be5402d4f8f32154c01065f7b01a99e61c2deff959715eb8656259c63195adb
 md5=aa6b7836fe6ccc99994bf15ff2b74e86
 sha256=d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2]
+md5=bc9904a9129aaf73408568ae1e2fa65f
+sha256=d1216c7c2be78d1dafad0cd46e464e9fa08f5e04544b76d9a0c547374c85801f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2]
 md5=2227f3fb86b02148f347e002662e53c8
 sha256=f6ddac6bc0b0a446ff9401467e4219340151498824d98c9274ed38a959330aea
@@ -29102,6 +29482,10 @@ sha256=f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029
 md5=816842de26bce8a935f3c9c3cfedbc42
 sha256=59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.1.tar.bz2]
+md5=1bb374fe5ab3ed780d353b2b12ba6255
+sha256=fd377af6e366e8e3a77c8ff825a009138c8343c0007bbf070ad605a649577e11
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2]
 md5=bb5182e3b74b3baa6fee245ac8bbf09a
 sha256=318bd61c8da6e938d5c707a0c70ba3ada1c053ff3172a918f821a1a015b7b6ce
@@ -29130,6 +29514,10 @@ sha256=6c7339466d5b3cfc3c6ea3ca4ec4bad2f16666f1c472efc4f3048c1f711c67d4
 md5=779a31151e44d2fd2a5ee1794f836889
 sha256=72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2]
+md5=b064a8d2f3d481ec36ef9ac17e13a77d
+sha256=543115c4b3a8603dcc9d7a3030c9e7ce20baf6e3976d92ff951cfea80b54981e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2]
 md5=74d6ba5e55afdfebff84db08b6589e26
 sha256=38eb95f2991fab51c3442022bcef258de508ebfa0c631024edbdf55a1c4f24fd
@@ -29146,6 +29534,10 @@ sha256=6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624
 md5=b13132f24683ef759bfb0c1db5096496
 sha256=c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.3.tar.bz2]
+md5=8161bbf2b100c21b609163f0010766b3
+sha256=3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2]
 md5=0201415230bf0454384c3bad099520d2
 sha256=65e95c95bc4fa5fdb766b7edf8f39253cf8496fca66bc4bc06f260ab9e9ce504
@@ -29162,6 +29554,10 @@ sha256=50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b
 md5=f3bddf0a64932ca9bd72041ccd3b5501
 sha256=a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.1.tar.bz2]
+md5=bcbceda78395de74544c83b46a7700cd
+sha256=70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2]
 md5=fa67bf34454888d38e15708395cfed87
 sha256=96b071b4e12dcfd027402621b897c6d73818aada4d66f77a8802cc46b9efe206
@@ -29182,6 +29578,10 @@ sha256=f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d
 md5=e89799579d0cf3858362bd751469e0bf
 sha256=a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.3.tar.bz2]
+md5=47f3c5da1942017218355f178f02ef84
+sha256=6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2]
 md5=69f28afc7b585d01bb06b1e2f872f8ea
 sha256=b7958afb0204bb1d3c8a33e7a56b94a6d4f09426dbcd141ef327e28f523d42eb
@@ -29198,6 +29598,10 @@ sha256=c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e
 md5=f98fc22142a009dc3a6cdf930c95203f
 sha256=1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.3.tar.bz2]
+md5=79f63999c88477801ae54dc486272ad6
+sha256=0556bb3e79da4be87e880f82e2b8504527e760e284680f9463a08f9572507187
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2]
 md5=981f46914c1e54742418f0444ea2e092
 sha256=5e67a6893375585be731b0fd822e9c3407a0930f7addbc8cf01fffad57f9d0b6
@@ -29238,6 +29642,10 @@ sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165
 md5=9a86b683f73f3806f55d05cd804a6f4a
 sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.1.tar.bz2]
+md5=61a1dc9a22991bd04d0ff98f800775c1
+sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
@@ -29286,6 +29694,10 @@ sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89
 md5=6d78c82ea7c2bb0fcb587d7bb4e8f60a
 sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.8.tar.bz2]
+md5=25287a202c986b33bd79fbe379c96a16
+sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
 md5=4df79349e26add4c23f6be8bec347ad4
 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -29302,6 +29714,10 @@ sha256=3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c
 md5=7c681d9b57f5e1f798263fc1a9d99245
 sha256=b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.3.tar.bz2]
+md5=c164effcc839eca1fc1d43a42f4086db
+sha256=025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2]
 md5=e00cc814ebdb3f3067e075bc93b26199
 sha256=2241fd7e5ae8de43f109f712f5125afa6ec5156068c941d7b65981ac7ce7548a
@@ -29314,14 +29730,26 @@ sha256=35409b42f843ac3b352e344253f3075b2d9c8ae2ac5af02962fd67575427e066
 md5=c159af867a9af3abc4da332189213a76
 sha256=39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-wsfb-0.3.0.tar.bz2]
+md5=d6b5d25dfd61fa5113216d10a6dcbb50
+sha256=78bdb6d397869dbd8560ae1f0ee65473977d19ca5afc9fa7638c35057284989e
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.0.tar.bz2]
 md5=08529fd015191be9244f598aa0894aa6
 sha256=5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.1.tar.bz2]
+md5=65a8d94d360b51690f8d4b2e7bfa036a
+sha256=cb19f5287f9d345fc4fe15ba7c9344a3be2d8395ebf19a139899d1566d7c9e18
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.3.tar.bz2]
 md5=c541152aee693fad743ef7cbf75a7ffc
 sha256=13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.4.tar.bz2]
+md5=0e7d0df07528c57304900da3acafc1a2
+sha256=ee0a178c89ff10d679e6f174d2a2e5cc7b89c7c7d5c115d48e9c75942f487395
+
 [http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2]
 md5=a318c1e86123832d7b0c95fc7d47ef35
 sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
@@ -29686,6 +30114,10 @@ sha256=5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353
 md5=f10717e45535b64eb45226aac571dac2
 sha256=34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482
 
+[http://xorg.freedesktop.org/releases/individual/app/xfs-1.1.0.tar.bz2]
+md5=5cfc06a320f74f07a0aa73da62307e9a
+sha256=47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfs-X11R7.0-1.0.1.tar.bz2]
 md5=a297da3d906110e9c29ec56c5ea578a8
 sha256=5d9df9048863f6d281fc1b71601ff7d31d5075eceeba462b3a32dd4734440c6a
@@ -29794,6 +30226,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
@@ -29874,6 +30310,14 @@ sha256=b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999
 md5=9144097186c3d2454beffe8ac3b53c6e
 sha256=c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590
 
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.1.1.tar.bz2]
+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
@@ -29890,6 +30334,10 @@ sha256=330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45
 md5=58e619576cbf4b6057eebb7a97fe2ddf
 sha256=3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b
 
+[http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.0.tar.bz2]
+md5=3e8a5f1faccc8ab00c6190e5a34e0a45
+sha256=a84728e34bb5edd36ecc1b5489f48ad1467ad5aab1f74f1b7789f826a1ffcaf9
+
 [http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.3.tar.bz2]
 md5=2fbcae1323c266edf5b6c61751f2e343
 sha256=0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
@@ -29950,6 +30398,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
@@ -29978,6 +30430,10 @@ sha256=921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1
 md5=f66d76abb0f75514ca32272e23cca757
 sha256=77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
 
+[http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.2.tar.bz2]
+md5=dca031355b4afcf8517a8258eeb730c3
+sha256=532df0398d3f4eab1cba8d0367c02a293ca74f2d89a27ef014854a2bde9a5a27
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkill-X11R7.0-1.0.1.tar.bz2]
 md5=35f47fd58d75c1ea5f414b21a10bdbf3
 sha256=fe59dfdcd43faf8efa778f9b2390525a606a62dcd7a70774982bc19301f6a3ce
@@ -30010,6 +30466,10 @@ sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131
 md5=69adcda848479acc3b82b3928812d191
 sha256=456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
 
+[http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.2.tar.bz2]
+md5=dc8b420bbfa35091ea30edf57c952ec2
+sha256=d66cd7682e5ea2a52e8da8a75ea6154f40a3a69938c6c2cf5d5c1e012f5c121b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsatoms-X11R7.0-1.0.1.tar.bz2]
 md5=737b4d7893aa886e8e4181c94380a421
 sha256=6a079872319ac7934578cace787f4f89ea87258f6dd8b33e5b4359be1256e9a3
@@ -30046,6 +30506,10 @@ sha256=1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02
 md5=7c6a783e42c88360ac31d259a864a19d
 sha256=51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43
 
+[http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.3.tar.bz2]
+md5=32f7ed4c089365cadb9382f6fbd750a9
+sha256=0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmag-X11R7.0-1.0.1.tar.bz2]
 md5=38ac487ac1b75be0253fe7f973947386
 sha256=d039d857c6d334d481452c20f5e419b1e120e03e6c9af709f071d9c00ffd9cd1
@@ -30078,6 +30542,10 @@ sha256=00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2
 md5=3d3a4b310a65ccce82472ef83acbbf97
 sha256=38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a
 
+[http://xorg.freedesktop.org/releases/individual/app/xman-1.1.0.tar.bz2]
+md5=5e5b3351bac26cc1f8490faf1c1402bb
+sha256=9d617ed760fe2147baae5ad9cbbdd85f1bb7534acfc3327bb51dad42e8bcc8b0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xman-X11R7.0-1.0.1.tar.bz2]
 md5=a4f21547120952aeb8e5663ebd72e843
 sha256=3d159c703ba901657d9633b239d39b21c8de68a2c3358fd1aa4175d20359ef87
@@ -30186,6 +30654,10 @@ sha256=d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818
 md5=f96f44b87132afd2fff677a8c89166dd
 sha256=4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8
 
+[http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.gz]
+md5=bca2403beb209952d66dc57be5a2f789
+sha256=9a5e3533a4156a0e308ced437bde722cb291becc2276bdd0952e30b3b5060e92
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/xorg-cf-files-X11R7.0-1.0.1.tar.bz2]
 md5=f2dd453c37386293fb207431b4a073dd
 sha256=019ba3dbfe2f23e5847cc839a26c630cea20fe8d62df4775a21087176908b9d7
@@ -30266,6 +30738,14 @@ 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/individual/xserver/xorg-server-1.7.3.tar.bz2]
+md5=4c63b22cad9ed8ae8b86561f0f92c327
+sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -30442,6 +30922,10 @@ sha256=0a9930e2ed7501d638cd90c948278b4f20e225c78c92cf2619e2b55a024e890e
 md5=d28007a50976204960fc1fc07b4ca093
 sha256=c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc
 
+[http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2]
+md5=9de22ca1522008c28fb03dfc41ba2d30
+sha256=7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2]
 md5=977ee3fd1525418aaa8bfc55ffbf6fc9
 sha256=f3c25042dfd332c3aee22176b3bcd244a99bc475112a97d9d4cc03505fe7b48f
@@ -30518,6 +31002,10 @@ sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257
 md5=5f65e24f8a225e255beb2059e33d6b37
 sha256=a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
 
+[http://xorg.freedesktop.org/releases/individual/app/xrx-1.0.3.tar.bz2]
+md5=c121945afcfc84e99af17158fda68be9
+sha256=9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrx-X11R7.0-1.0.1.tar.bz2]
 md5=9de3b04392c98df59c79a34fd51c385f
 sha256=2a177a9f36c92fdc109260a7c04980db6920fb9d3529d79e9bc019ae7f5a310e
@@ -30874,6 +31362,10 @@ sha256=55fc617d536e58f088c694e71e1a02d3019c887c9abd2222574f84866b145d5e
 md5=6e3c5d0297d88e890b6f5df31f73dd60
 sha256=d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
 
+[http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.2.tar.bz2]
+md5=20bc5d85634964d4ceee77cdfcd131ed
+sha256=84345dfbff0dc411689639aada2407758640af71eb61a1be332bfa24d8b90ac1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwud-X11R7.0-1.0.1.tar.bz2]
 md5=e08d2ee04abb89a6348f47c84a1ff3ed
 sha256=a10c7950ad632f07426ea9516b3743c562da8403f0da0cc678277031020f1586
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
new file mode 100644
index 0000000000..d2ee2b6a23
--- /dev/null
+++ b/conf/compatibility-providers.conf
@@ -0,0 +1,72 @@
+#############################################################################
+# DEFAULT PREFERRED PROVIDERS
+# Every distribution should include this file.
+# It will make adding new providers easier.
+#PREFERRED_PROVIDER_atd ?= "atd-over-fso"
+PREFERRED_PROVIDER_atd ?= "atd"
+PREFERRED_PROVIDER_avahi ?= "avahi"
+PREFERRED_PROVIDER_bluez-libs ?= "bluez4"
+PREFERRED_PROVIDER_bluez-utils ?= "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus ?= "bluez-utils"
+PREFERRED_PROVIDER_classpath ?= "classpath"
+PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
+PREFERRED_PROVIDER_esound ?= "pulseaudio"
+#PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr"
+PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu"
+#PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config-shr"
+PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config"
+PREFERRED_PROVIDER_gconf ?= "gconf"
+#PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
+#PREFERRED_PROVIDER_gpsd ?= "fso-gpsd"
+PREFERRED_PROVIDER_gpsd ?= "gpsd"
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
+PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
+PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
+PREFERRED_PROVIDER_hotplug ?= "udev"
+PREFERRED_PROVIDER_libfribidi ?= "fribidi"
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_libxss ?= "libxss"
+PREFERRED_PROVIDER_ntp ?= "ntp"
+PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+#PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
+PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
+PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
+PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
+PREFERRED_PROVIDER_tslib-conf ?= "tslib"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_util-linux ?= "util-linux-ng"
+PREFERRED_PROVIDER_virtual/alsa-scenarios ?= "alsa-scenarii-shr"
+PREFERRED_PROVIDER_virtual/db ?= "db"
+#PREFERRED_PROVIDER_virtual/db ?= "db3"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+#PREFERRED_PROVIDER_virtual/db-native ?= "db3-native"
+PREFERRED_PROVIDER_virtual/gail ?= "gtk+"
+PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial"
+PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
+#PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom"
+PREFERRED_PROVIDER_virtual/shr-splash-theme ?= "shr-splash-theme-logo"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index c9fc16365b..26614adb72 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -84,23 +84,8 @@ PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
 PREFERRED_VERSION_glibc-initial 	?= "2.9"
-PREFERRED_VERSION_uclibc        	?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
-
-# Preferred provider for virtual/psplash
-# This enforces a specific brand to be used, in our case the angstrom
-# one. In case you want to change the logo or something like that we
-# suggest you to create another recipe (e.g: psplash-<brand>) for that
-# and add that into your image.
-# You can also opt to change or override this line, but that isn't
-# needed because psplash is using update-alternatives.
-PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-angstrom"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
-PREFERRED_PROVIDER_virtual/gail    ?= "gtk+"
-
-PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_VERSION_uclibc        	?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30.1"
 
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
@@ -140,76 +125,31 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 # Toolchain virtuals:
 require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
-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       ?= "libx11"
-
-# Others:
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
-PREFERRED_PROVIDER_esound               ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf                ?= "gconf"
-PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib                ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg"
-PREFERRED_PROVIDER_libxss                = "libxss"
-PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs            = "bluez4"
-PREFERRED_PROVIDER_bluez-utils           = "bluez4"
-PREFERRED_PROVIDER_util-linux            = "util-linux-ng"
+PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
+
 # The default is too old for linux-libc-headers-2.6.31:
 PREFERRED_VERSION_mplayer                = "0.0+1.0rc2+svnr29789"
 
 ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
 
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
-
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
 #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
 ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc
 
-
-
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
 IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+
 # Select xserver-xorg as default, since kdrive has been EOL'ed
 XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" 
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
 
 # do some task-base stuff here
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 3098101d7f..d59c99ec00 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -16,7 +16,7 @@ PREFERRED_VERSION_gtkmm		= "2.18.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
-PREFERRED_VERSION_libsdl-x11	= "1.2.11"
+PREFERRED_VERSION_libsdl-x11	= "1.2.14"
 PREFERRED_VERSION_libtool 	= "2.2.6a"
 PREFERRED_VERSION_libtool-native = "2.2.6a"
 PREFERRED_VERSION_libtool-cross	= "2.2.6a"
@@ -36,8 +36,8 @@ PREFERRED_VERSION_udev 		= "141"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_usbutils = "0.82"
-PREFERRED_VERSION_util-macros-native = "1.2.1"
-PREFERRED_VERSION_util-macros = "1.2.1"
+PREFERRED_VERSION_util-macros-native = "1.3.0"
+PREFERRED_VERSION_util-macros = "1.3.0"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 PREFERRED_VERSION_xserver-xorg = "1.6.1"
diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
index 3dbb175f93..e060bb1ccf 100644
--- a/conf/distro/include/angstrom-package-deb.inc
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -1,4 +1,4 @@
 INHERIT += "package_deb"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/angstrom-package-ipk.inc
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -1,5 +1,4 @@
 INHERIT += "package_ipk"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 6e65285e99..8647dd7ec4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}"
 
 TARGET_VENDOR = "-angstrom"
 
-# Add FEED_ARCH to overrides
-OVERRIDES .= ":${FEED_ARCH}"
+SOC_FAMILY ?= "Unknown"
+
+# Add FEED_ARCH and SOC_FAMILY to overrides
+OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
 
 # Put links to sources in deploy/sources to make it easier for people to be GPL compliant
 INHERIT += "src_distribute_local"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 5ec80ffeb1..204047fd63 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils			?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross		?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross-sdk		?= "2.18.50.0.7"
 PREFERRED_VERSION_busybox			?= "1.13.2"
-PREFERRED_VERSION_dbus				?= "1.2.1"
+PREFERRED_VERSION_dbus				?= "1.2.3"
 PREFERRED_VERSION_gcc				?= "4.2.4"
 PREFERRED_VERSION_gcc-cross			?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-sdk			?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-initial		?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-intermediate	?= "4.2.4"
-PREFERRED_VERSION_glib-2.0			?= "2.18.3"
-PREFERRED_VERSION_glib-2.0-native		?= "2.18.0"
+PREFERRED_VERSION_glib-2.0			?= "2.22.1"
+PREFERRED_VERSION_glib-2.0-native		?= "2.22.1"
 PREFERRED_VERSION_glibc				?= "2.6.1"
 PREFERRED_VERSION_glibc-initial			?= "2.6.1"
 PREFERRED_VERSION_ipkg				?= "0.99.163"
 PREFERRED_VERSION_ipkg-native			?= "0.99.163"
-PREFERRED_VERSION_libtool			?= "2.2.4"
-PREFERRED_VERSION_libtool-native		?= "2.2.4"
-PREFERRED_VERSION_libtool-cross			?= "2.2.4"
-PREFERRED_VERSION_libtool-sdk			?= "2.2.4"
+PREFERRED_VERSION_libtool			?= "2.2.6a"
+PREFERRED_VERSION_libtool-native		?= "2.2.6a"
+PREFERRED_VERSION_libtool-cross			?= "2.2.6a"
+PREFERRED_VERSION_libtool-sdk			?= "2.2.6a"
 PREFERRED_VERSION_linux-libc-headers		?= "2.6.23"
 PREFERRED_VERSION_m4				?= "1.4.8"
 PREFERRED_VERSION_m4-native			?= "1.4.8"
diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc
index 4f38b8f936..d953d6ebe0 100644
--- a/conf/distro/include/sane-feed-deb.inc
+++ b/conf/distro/include/sane-feed-deb.inc
@@ -2,5 +2,5 @@
 
 INHERIT += "package_deb"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/sane-feed-ipk.inc
+++ b/conf/distro/include/sane-feed-ipk.inc
@@ -1,5 +1,4 @@
 INHERIT += "package_ipk"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index f99b44945c..1372c0aad2 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -30,7 +30,7 @@ SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
 SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
 SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
-SRCREV_pn-libframeworkd-glib ?= "dc5409fbf9d2d22a7fa871199bb66da5ac6f5084"
+SRCREV_pn-libframeworkd-glib ?= "411fa741227842dc993aba24184c7c6db0d09ba5"
 SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
 SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
 SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e755bf5b75..2b332fbf34 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -20,7 +20,7 @@ SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
-SRCREV_pn-babiloo-efl ?= "288"
+SRCREV_pn-babiloo-efl ?= "296"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654"
 SRCREV_pn-bootchart-lite ?= "4"
@@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "14"
+SRCREV_pn-e-tasks ?= "18"
 SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -58,15 +58,15 @@ SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-ebrainy ?= "21"
 SRCREV_pn-eds-dbus ?= "736"
-SRCREV_pn-elementary-theme-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-elementary-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-elementary-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-elementary-theme-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-elmdentica ?= "171"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-enotes ?= "19"
-SRCREV_pn-epdfview ?= "345"
+SRCREV_pn-epdfview ?= "346"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-essential-dialer ?= "194"
 SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -107,18 +107,7 @@ SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-intone ?= "66"
@@ -196,12 +185,13 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "1096"
+SRCREV_pn-navit ?= "2846"
+SRCREV_pn-navit-icons ?= "2618"
 SRCREV_pn-neod ?= "4617"
-SRCREV_pn-neomis ?= "2"
+SRCREV_pn-neomis ?= "6"
 SRCREV_pn-net-snmp ?= "17367"
 SRCREV_pn-netsurf ?= "3859"
-SRCREV_pn-numberx ?= "3"
+SRCREV_pn-numberx ?= "4"
 SRCREV_pn-numptyphysics ?= "109"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
@@ -258,9 +248,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
-SRCREV_pn-opkg ?= "413"
-SRCREV_pn-opkg-native ?= "413"
-SRCREV_pn-opkg-sdk ?= "413"
+SRCREV_pn-opkg ?= "446"
+SRCREV_pn-opkg-native ?= "446"
+SRCREV_pn-opkg-sdk ?= "446"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
@@ -302,9 +292,9 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "87"
+SRCREV_pn-shr-launcher ?= "92"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
-SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763"
+SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7"
 SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"
 SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -316,6 +306,7 @@ SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
+SRCREV_pn-shr-wizard ?= "35c1042d4547495033c04abb0c038f966a40e048"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
@@ -343,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "43996"
+EFL_SRCREV ?= "44165"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
@@ -416,6 +407,9 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
 
+#illume default keyboards
+SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
+
 #exalt
 SRCREV_pn-exalt ?= "${EFL_SRCREV}"
 SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 122433b7fc..9449b87604 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -13,4 +13,5 @@ SRCREV_pn-libphone-ui = "${AUTOREV}"
 SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
 SRCREV_pn-libphone-utils = "${AUTOREV}"
 SRCREV_pn-opimd-utils = "${AUTOREV}"
+SRCREV_pn-shr-wizard = "${AUTOREV}"
 
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8a331ae7f2..10a2bc4a02 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi			?= "avahi"
 PREFERRED_PROVIDER_gconf			?= "gconf"
 PREFERRED_PROVIDER_virtual/libusb0		?= "libusb-compat"
 
+# we use bluez4 instead of the older bluez3
+DISTRO_BLUETOOTH_MANAGER			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus		= "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils			= "bluez4"
+
 # Include any package preferred versions and srcrevs:
 
 require conf/distro/include/preferred-slugos-versions.inc
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
index 9d84d1b8c8..97de5cd257 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2009.1.conf
@@ -27,6 +27,7 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
 #<>
 #<>------------------------------------------------------------------<
 IMAGE_NAME = "${IMAGE_BASENAME}-2009.1-${MACHINE}"
+SPLASH = "psplash"
 
 #
 # Naming schemes + packages
@@ -56,6 +57,9 @@ PREFERRED_PROVIDER_virtual/gtk+ = "gtk+"
 PREFERRED_PROVIDER_gconf = "gconf"
 PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static"
+PREFERRED_PROVIDER_bluez-libs = "bluez-libs"
+PREFERRED_VERSION_gettext-native = "0.14.1"
 
 PREFERRED_VERSION_gcc = "4.2.2"
 PREFERRED_VERSION_gcc-cross = "4.2.2"
@@ -64,6 +68,9 @@ PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
 PREFERRED_VERSION_binutils = "2.18"
 PREFERRED_VERSION_binutils-cross = "2.18"
 PREFERRED_VERSION_coreutils-native = "6.0"
+PREFERRED_VERSION_e2fsprogs-libs-native = "1.35"
+
+PREFERRED_VERSION_cdparanoia  = "10.2"
 
 #
 # Target OS & FPU system
@@ -96,5 +103,4 @@ PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 PREFERRED_PROVIDER_tslib = "tslib"
 PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 25880dff9d..d9fc595303 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -72,12 +72,6 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\
 ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 #############################################################################
-# PREFERRED PROVIDERS
-#############################################################################
-PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
-PREFERRED_PROVIDER_virtual/libx11	= "libx11"
-PREFERRED_PROVIDER_virtual/gail         ?= "gtk+"
-#############################################################################
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 33eceab456..1e9eec20f4 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -84,20 +84,6 @@ LIBC ?= "eglibc"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
-# PREFERRED PROVIDERS
-#############################################################################
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-PREFERRED_PROVIDER_virtual/db = "db3"
-PREFERRED_PROVIDER_virtual/db-native = "db3-native"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
-
-#############################################################################
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 2a33427e30..b99c895dc2 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -30,6 +30,7 @@ DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
 DISTRO_SSH_DAEMON = "openssh"
+DISTRO_APM = "fso-apm"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -155,34 +156,11 @@ require conf/distro/include/sane-toolchain.inc
 #############################################################################
 # PREFERRED PROVIDERS
 #############################################################################
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_PROVIDER_gconf = "gconf"
-PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo"
-PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 PREFERRED_PROVIDER_gpsd = "fso-gpsd"
-PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
-PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
-PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
-PREFERRED_PROVIDER_libfribidi = "fribidi"
-PREFERRED_PROVIDER_bluez-libs = "bluez4"
-PREFERRED_PROVIDER_bluez-utils = "bluez4"
-PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_PROVIDER_virtual/gail = "gtk+"
-PREFERRED_PROVIDER_opkg = "opkg"
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
 PREFERRED_PROVIDER_atd = "atd-over-fso"
-PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free"
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-PREFERRED_PROVIDER_virtual/db = "db3"
-PREFERRED_PROVIDER_virtual/db-native = "db3-native"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_opkg = "opkg"
 PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 
 #############################################################################
 # PREFERRED VERSIONS
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index d82be5d2b5..d9b00f41a8 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -12,7 +12,8 @@ DISTRO_TYPE = "alpha"
 TARGET_ARCH ?= "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-gnueabi"
-IPKG_VARIANT ?= "opkg-nogpg-nocurl"
+IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos"
 IMAGE_INITSCRIPTS ?= "initscripts-slugos"
 
 require conf/distro/include/slugos.inc
diff --git a/conf/machine/cm-t35.conf b/conf/machine/cm-t35.conf
new file mode 100644
index 0000000000..ccb9f95773
--- /dev/null
+++ b/conf/machine/cm-t35.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: CM-T35 machine
+#@DESCRIPTION: Machine configuration for the CompuLab CM-T35 board (http://www.compulab.co.il/t3530/html/t3530-cm-datasheet.htm)
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+	   xf86-input-evtouch \
+	   xf86-input-tslib \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+require conf/machine/include/omap3.inc
+
+IMAGE_FSTYPES += "tar.bz2 ubi"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+# Guesswork
+SERIAL_CONSOLE = "115200 ttyS2"
+
+UBOOT_MACHINE = "cm_t35_config"
+PREFERRED_VERSION_u-boot = "git"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 4039 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 4039"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-O 2048 -m 2048 -p 128KiB"
+
+MACHINE_EXTRA_RRECOMMENDS = "marvell-sdio-fw"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa wifi ext2"
+
diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf
index 4df4d63cca..0164e1c27d 100644
--- a/conf/machine/da830-omapl137-evm.conf
+++ b/conf/machine/da830-omapl137-evm.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI DA830/OMAPL137 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/omapl137.inc
 
 UBOOT_MACHINE = "da830_omapl137_evm_config"
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
index bbcb45002e..b61c00ca27 100644
--- a/conf/machine/da850-omapl138-evm.conf
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
 
 UBOOT_MACHINE = "da850_omapl138_evm_config"
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index e3c0554f71..63fc2cacc4 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -28,4 +28,5 @@ MACHINE_FEATURES = "kernel26 serial"
 #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
 
 require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/dm6446.inc
 
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
index 73c9f1e017..a352b5e926 100644
--- a/conf/machine/dm355-evm.conf
+++ b/conf/machine/dm355-evm.conf
@@ -5,4 +5,4 @@
 require conf/machine/include/davinci.inc
 require conf/machine/include/dm355.inc
 
-UBOOT_MACHINE = "davinci_dm355evm_config"
+UBOOT_MACHINE = "davinci_dm355_evm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 7cea5dc727..1fd51234e2 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/dm365.inc
 
 UBOOT_MACHINE = "davinci_dm365evm_config"
diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf
index 8b048a5474..aaa7492991 100644
--- a/conf/machine/dm6446-evm.conf
+++ b/conf/machine/dm6446-evm.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/dm6446.inc
 
 UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
index 5a9df79ade..ccf571ef9f 100644
--- a/conf/machine/hawkboard.conf
+++ b/conf/machine/hawkboard.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI Hawkboard
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.conf
 
 UBOOT_MACHINE = "da850_omapl138_evm_config"
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index ceafa800b2..3f8254aff4 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r12"
+MACHINE_KERNEL_PR = "r28"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc
index dffafe4460..d666d5e030 100644
--- a/conf/machine/include/dm355.inc
+++ b/conf/machine/include/dm355.inc
@@ -1,9 +1,2 @@
-
-DEVICES       = "DM355"
-GPPOS         = "LINUX_GCC"
-PLATFORM      = "dm355"
-PROGRAMS      = "APP_LOCAL"
-TARGET        = "dm355_al"
-XDC_PLATFORM  = ti.platforms.evmDM355
-
+SOC_FAMILY = "dm355"
 
diff --git a/conf/machine/include/dm365.inc b/conf/machine/include/dm365.inc
new file mode 100644
index 0000000000..c53680ea63
--- /dev/null
+++ b/conf/machine/include/dm365.inc
@@ -0,0 +1,12 @@
+SOC_FAMILY = "dm365"
+
+
+# DMAI
+PLATFORM      = "dm365"
+XDC_PLATFORM  = ti.platforms.evmDM365
+
+# Obsoleted (CE examples rebuild)
+#GPPOS         = "LINUX_GCC"
+
+# DMAI recipe
+#TARGET        = "dm365_al"
diff --git a/conf/machine/include/dm6446.inc b/conf/machine/include/dm6446.inc
new file mode 100644
index 0000000000..c14e573c74
--- /dev/null
+++ b/conf/machine/include/dm6446.inc
@@ -0,0 +1,13 @@
+SOC_FAMILY = "dm6446"
+
+# TI DVSDK stuff:
+DSPCFG            ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG     ?= "DM6446GEMSHMEM"
+DSPLINKGPPOS      ?= "MVL5G"
+DSPLINKPLATFORM   ?= "DAVINCI"
+DSPLINKSOC        ?= "DM6446"
+DSPPOWERSOC       ?= "DM6446"
+GPPOS             ?= "LINUX_GCC"
+PLATFORM          ?= "dm6446"
+XDC_PLATFORM      ?= "ti.platforms.evmDM6446"
+
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 2f242a4b38..9ff7b91ad9 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,3 +1,5 @@
+SOC_FAMILY = "omap3"
+
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
@@ -12,17 +14,10 @@ UBOOT_LOADADDRESS = "0x80008000"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # TI DVSDK stuff:
-CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-CODEC             ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-DEVICES           ?= "OMAP3530"
-DSPCFG            ?= "OMAP3530SHMEM"
+# DSPLink rebuild
 DSPLINKDSPCFG     ?= "OMAP3530SHMEM"
 DSPLINKGPPOS      ?= "OMAPLSP"
 DSPLINKPLATFORM   ?= "OMAP3530"
 DSPLINKSOC        ?= "3530"
-DSPPOWERSOC       ?= "omap3530"
-GPPOS             ?= "LINUX_GCC"
-LPMDSPPOWERSOC    ?= "omap3530"
-PLATFORM          ?= "omap3530"
-XDC_PLATFORM      ?= "ti.platforms.evm3530"
+
 
diff --git a/conf/machine/include/omapl137.conf b/conf/machine/include/omapl137.conf
new file mode 100644
index 0000000000..34d0e9a754
--- /dev/null
+++ b/conf/machine/include/omapl137.conf
@@ -0,0 +1,2 @@
+SOC_FAMILY = "omapl137"
+
diff --git a/conf/machine/include/omapl138.conf b/conf/machine/include/omapl138.conf
new file mode 100644
index 0000000000..4c222753df
--- /dev/null
+++ b/conf/machine/include/omapl138.conf
@@ -0,0 +1 @@
+SOC_FAMILY = "omapl138"
diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc
index a7dd04f596..44058c12be 100644
--- a/conf/machine/include/tune-atom.inc
+++ b/conf/machine/include/tune-atom.inc
@@ -1,8 +1,9 @@
 # GCC 4.3.0- (see Poky)
 # TARGET_CC_ARCH = "-march=i586"
-#
 # GCC 4.3.1+ (see Gentoo)
 TARGET_CC_ARCH = "-march=core2"
-
 # GCC 4.4.2+ (see Fedora 12)
 #TARGET_CC_ARCH = "-march=i686 -mtune=atom"
+BASE_PACKAGE_ARCH = "i686"
+FEED_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
\ No newline at end of file
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index d9f1c1ba85..1ba4a3422d 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -3,6 +3,9 @@
 MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+# Starting with 2.6.32 linux-rp is deprecated
+#PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 
diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf
index f58219bd1a..23b3cf7c37 100644
--- a/conf/machine/ion.conf
+++ b/conf/machine/ion.conf
@@ -8,8 +8,6 @@ TARGET_ARCH = "i686"
 
 #MACHINE_ARCH = "core2"
 
-PACKAGE_EXTRA_ARCHS = "x86"
-
 include conf/machine/include/tune-atom.inc
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index b751cbcac2..9b552a462a 100644
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -26,4 +26,5 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 
 require conf/machine/include/tune-arm926ejs.inc
 require conf/machine/include/neuros.inc
+require conf/machine/include/dm6446.inc
 
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index c896fa0b02..b504723afa 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -29,14 +29,14 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 #IMAGE_FSTYPES += "tar.bz2 ubi"
 IMAGE_FSTYPES = "tar.bz2"
-#EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
 require conf/machine/include/omap3.inc
 
-# Put it below omap3.inc as we override the kernel here
+# Put it below omap3.inc as we override the kernel and PR here
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+MACHINE_KERNEL_PR = "r2"
 
 # Use our 'Powered by Angstrom' splash for the images.
 PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora"
@@ -65,10 +65,8 @@ UBOOT_MACHINE = "omap3_pandora_config"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-EXTRA_IMAGEDEPENDS += "x-load"
-
-PREFERRED_VERSION_libgles-omap3 = "3.00.00.09"
+PREFERRED_VERSION_u-boot-omap3pandora = "git"
+PREFERRED_VERSION_x-load-omap3pandora = "git"
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
diff --git a/conf/machine/simone.conf b/conf/machine/simone.conf
new file mode 100644
index 0000000000..f91b292aa1
--- /dev/null
+++ b/conf/machine/simone.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@Name: SimpleMachines Sim.One developer board
+#@DESCRIPTION: Machine configuration for SimpleMachines Sim.One developer board
+#@HOMEPAGE: http://simplemachines.it/simone.html
+
+require conf/machine/ep93xx.conf
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "c0008000"