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

Conflicts: recipes/musicpd/mpd_0.14.2.bb
author: Sergey Lapin <slapin@ossfans.org> 2009-06-26 22:32:52 +0400
committer: Sergey Lapin <slapin@ossfans.org> 2009-06-26 22:32:52 +0400
commit: c91a54aef8a39e7cbb2571574f56f2cf12104ff1 (patch)
tree: e68102d093c111affd9208b78df9c18aa837c3b8 /conf
parent: 323edc5ef4c3d8572ee0b4fd185ca6e3166d6b45 (diff)
parent: 84efca2e2ad21d3d7cea68c0327f91aaf773eb67 (diff)
68 files changed, 1308 insertions, 300 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 95ee9c6136..8b6956453b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -164,7 +164,7 @@ P = "${PN}-${PV}"
 
 # Define a PR for kernels that machines can override so things like
 # modules get rebuilt
-MACHINE_KERNEL_PR ?= "r0"
+MACHINE_KERNEL_PR = ""
 
 # Base package name
 # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
@@ -211,13 +211,10 @@ PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 PACKAGES_DYNAMIC = "${PN}-locale-*"
 FILES = ""
 
-# NB: ${base_libdir}/*${SOLIBSDEV} is included here because the shared libraries
-# in ${base_libdir} do not follow the usual *.so.* naming convention, for instance
-# libproc-3.2.7.so
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* \
-            ${base_libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBSDEV} \
+            ${base_libdir}/*${SOLIBS} \
             ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
@@ -322,7 +319,6 @@ SDK_PATH = "/usr/local/${SDK_NAME}"
 # Kernel info.
 ##################################################################
 
-OLDEST_KERNEL = "2.4.0"
 STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel"
 
 ##################################################################
@@ -475,7 +471,7 @@ EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} "
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g"
 SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
-BUILD_OPTIMIZATION = "-O2"
+BUILD_OPTIMIZATION = "-O2 -g"
 
 ##################################################################
 # Bootstrap stuff.
@@ -508,7 +504,7 @@ E_URI = "http://enlightenment.freedesktop.org/files"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 FREESMARTPHONE_GIT = "git://git.freesmartphone.org"
-GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
+GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
 GNOME_GIT = "git://git.gnome.org"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
@@ -612,6 +608,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 ENTERPRISE_DISTRO ?= "0"
 
 # Pre-build configuration output
+
+BUILDCFG_HEADER = "Build Configuration:"
 BUILDCFG_VARS ?= "BB_VERSION METADATA_BRANCH METADATA_REVISION TARGET_ARCH TARGET_OS MACHINE DISTRO DISTRO_VERSION"
 BUILDCFG_VARS_append_arm = " TARGET_FPU"
 BUILDCFG_VARS_append_armeb = " TARGET_FPU"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index aa5b5beaec..3d8c9d3dda 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -186,6 +186,10 @@ sha256=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7
 md5=8b311547f4a2c8c6b6598e3318d66cd7
 sha256=d2d21f995d1a152ca2d8beea6d37f31e48cca034b82ceb7322f39422e849e9cf
 
+[http://hal.freedesktop.org/releases/DeviceKit-disks-004.tar.gz]
+md5=1ed8e1931f56ad3fc53ba485391434b5
+sha256=e9cc2ed4db0f48a9fdb353f6774df585ac1bc3a0f7c77fcede1c1c27497882bd
+
 [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz]
 md5=2449bfe21d6589c96eebf94dae24df6b
 sha256=3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989
@@ -218,6 +222,14 @@ sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
 md5=59ca16f600e96c8c104a485ff7c322c6
 sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
 
+[http://directfb.org/downloads/Old/DirectFB-1.2.7.tar.gz]
+md5=59ca16f600e96c8c104a485ff7c322c6
+sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
+
+[http://directfb.org/downloads/Core/DirectFB-1.2/DirectFB-1.2.8.tar.gz]
+md5=ac13d21682aa368df4e177ae5b51ad2d
+sha256=cbf94eb10e9c305c81b24e298e55c7825df5ab9060d82443f7b9734f760f859d
+
 [http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz]
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
@@ -1014,6 +1026,14 @@ sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71
 md5=e65a007157e3e26807db52299497109d
 sha256=e064a939bf7e37774b89a39515ecf96c4d19c81e050bcf0dae28d1eab4d86196
 
+[http://install.source.dir.com/TI-C6x-CGT-v6.0.16-eval.tar.gz]
+md5=152fdf383df154b33478a0312752bade
+sha256=0eb1d3af0a02179edb91b5468972265f13c3a89990549f289233c0784937ab9e
+
+[http://install.source.dir.com/TI-C6x-CGT-v6.0.21-eval.tar.gz]
+md5=65c8166ad0edb468c5327d1109d84229
+sha256=6011f7a10fa71a540503fc8d54140728022ec89eb8bc2ef344002bb11cf25667
+
 [http://sdgsystems.com/pub/ipaq/hx4700/src/TIInit_3.2.26.bts]
 md5=8741490a25b98230973446400971bba9
 sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e
@@ -1298,6 +1318,10 @@ sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
 md5=5c9b705700df51d232be223b6ab6414d
 sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
 
+[http://downloads.sourceforge.net/acpid/acpid-1.0.8.tar.gz]
+md5=1d9c52fe2c0b51f8463f357c2a3d3ddb
+sha256=d57ae5302c38c37d060a097fa51600fe06fbfffd575641d638407944f126b7b1
+
 [http://ftp.gnu.org/gnu/classpathx/activation-1.1.1.tar.gz]
 md5=de50d7728e8140eb404f2b4554321f8c
 sha256=b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7
@@ -1398,6 +1422,14 @@ sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833
 md5=de60df7541fafe8c6a3397e0f105ff0e
 sha256=c487645d32b8124b9ae224b8929e5aa45e581bd8d8c8da666add423cf927d1ea
 
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2]
+md5=73db3666c211e5fb023bb77450cf430d
+sha256=32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886
+
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.20.tar.bz2]
+md5=6e9080ba1faa5d3739d14dd76c62d8dc
+sha256=15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
+
 [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
 md5=3106c2d59a329263867fa3dd44133dda
 sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
@@ -1426,6 +1458,10 @@ sha256=35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560
 md5=4a798b47ba10c17aed66dff234d31b24
 sha256=deb7652a3c1360febbbffb5d0150e5ad8547063d37969ad24d13359f75a424ba
 
+[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.19.tar.bz2]
+md5=29ae9cac05423cf6a49f66eeb1a79eb6
+sha256=67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100
+
 [ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2]
 md5=ba9b8010120701d0f6daf061d392cfa2
 sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
@@ -1450,6 +1486,10 @@ sha256=6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125
 md5=0a6b26d27cc2adfd591d91d8c155fdb7
 sha256=ea0ae914cc8d46254dc02ca2b227d379d0eb1d76a3960907e57f26f2ec584aef
 
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2]
+md5=5ff0379c707c1a29083233edc9ab4e06
+sha256=1f4924f5ae7857ce64a3d6ecbeb98133c74ff1ead2b0f48187623d6e4b838cad
+
 [http://www.panix.com/~gesslein/am.tgz]
 md5=df7535050d4bbe57c5d1243c8ec2479e
 sha256=13ab5d2045d902b627725e7cf4fc82df3ec2e714e85e42b93bd48af7af9bffdc
@@ -1538,6 +1578,10 @@ sha256=17da486f983597f28c0efadb261b76b733155be7451ef34eefc65cb4058d883d
 md5=d5d7c69837cc7dcbf2aa181ff423ab20
 sha256=a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50
 
+[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.2.0.tar.bz2]
+md5=44e18d01857f9dfeb8628e317e786f31
+sha256=4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/applewmproto-X11R7.0-1.0.3.tar.bz2]
 md5=2acf46c814a27c40acd3e448ed17fee3
 sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
@@ -2010,6 +2054,10 @@ sha256=f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7
 md5=36d3fe706ad0950f1be10c46a429efe0
 sha256=93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1
 
+[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2]
+md5=7565809ed801bb5726da0631ceab3699
+sha256=264d7c1c0e268bc77fbe0f308e085545535edfe73f33e27c80219cc0c9c71246
+
 [http://kernel.org//pub/linux/daemons/autofs/v3/autofs-3.1.7.tar.bz2]
 md5=4f602f82442b48ce9c2e0005d59c3408
 sha256=838c6e92c39827b54a37559a02c9b409a4f7ec3124cc6d20845aabfaabe2dd18
@@ -2614,6 +2662,10 @@ sha256=bd2ea10ffc2bf62a917b05f4fbe3d02212589c2bc177fa0c51a9c874d3da528a
 md5=73e76bdd997fa945d71edcfbdd356c15
 sha256=18f72b922a9a346f6c43b20fd86eba76cfd27a8d118ea32fa879050ddebe0267
 
+[http://install.source.dir.com/bios_setuplinux_5_33_02.bin]
+md5=64f61b08d091625c0912cb9de33242af
+sha256=506e07715028811b8d945c85c54ae07bc33bdd8afff1611cbb30d154ba86d04e
+
 [ftp://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz]
 md5=c17f964fd5504b88b07a183420de25e3
 sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1
@@ -2750,6 +2802,18 @@ sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
 md5=ba06291b737077332e914d6d653501c6
 sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.40.tar.gz]
+md5=a25fa37c97c309338649f6a5fd4cea76
+sha256=1208d8e986f8b545659db21c8220ec28b48979627158123dd9018f9733d858d2
+
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.41.tar.gz]
+md5=4629236517df280be321f009917a52be
+sha256=0b22f518085528b71aa9eab8bbc44d2696458c85d902c6a6686076ae10d64549
+
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.42.tar.gz]
+md5=d24dfd3ca42847123e29f58b29af6948
+sha256=ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -3198,6 +3262,10 @@ sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
 md5=b9d77c57bda2e019207a1874d9bb4dea
 sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
 
+[http://downloads.sourceforge.net/bwmng/bwm-ng-0.6.tar.gz]
+md5=d3a02484fb7946371bfb4e10927cebfb
+sha256=c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd
+
 [http://downloads.sourceforge.net/bwmon/bwmon-1.3.tar.gz]
 md5=53c44b73aa67d5e0282adfe928f3ba44
 sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
@@ -3434,6 +3502,10 @@ sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21
 md5=09b2019e926d5ef42d52edb2dd33ceae
 sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602
 
+[http://pub.risujin.org/cellwriter/cellwriter-1.3.4.tar.gz]
+md5=72b4e552a32d6acd888da0b88aeebbdd
+sha256=6ab6fa697938af0fc8b587ccd7c5889087800569e558b97797963c6ee2fada0c
+
 [http://centericq.de/archive/source/releases/centericq-4.11.0.tar.bz2]
 md5=bed5e7eeb60b5ac0045f201f13130964
 sha256=4f0f769a6e1cc7d76b527829deef34861ed8f79ae07e29d49566df3594308380
@@ -3482,6 +3554,10 @@ sha256=fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
 md5=9a4d5665b8be07513f5ac4e6eec537e6
 sha256=fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
 
+[http://downloads.sourceforge.net/check/check-0.9.5.tar.gz]
+md5=30143c7974b547a12a7da47809a90951
+sha256=961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6
+
 [http://handhelds.org/~zecke/oe_packages/checkers_V1.0.5ern.tar.gz]
 md5=82b08b1980ec6fbfc83b4dc0e2df10f7
 sha256=543435cb0988acc90a6e651e424eb331aba3f73361036d7af458bc1233973199
@@ -3742,6 +3818,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797
 md5=d8f3bbfbcc337d9776991d9561f451f3
 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
 
+[http://install.source.dir.com/codec_engine_2_23_01.tar.gz]
+md5=581f548714a53d818ac355a1e4aacfa4
+sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8
+
 [http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz]
 md5=581f548714a53d818ac355a1e4aacfa4
 sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8
@@ -3914,6 +3994,10 @@ sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405
 md5=7bc5c89870d47c88f407fcfd666c739d
 sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.18.tar.gz]
+md5=b58cb56d0403bfafb3972e82a339546c
+sha256=923ce04b8ff93aa9eec4df6c822f1c7d35e8aea1ab8680bd0d9a5e4d327dd3c6
+
 [http://www.kernel.org/pub/linux/network/connman/connman-0.19.tar.gz]
 md5=3d61c5db55d225c3efbf4c950dc0842f
 sha256=cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0
@@ -3954,6 +4038,10 @@ sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
 md5=c9a3b384f080ed4cdf139ce9377ef2c8
 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
 
+[http://www.kernel.org/pub/linux/network/connman/connman-gnome-0.5.tar.gz]
+md5=0e1c4c25d19cad9b08a216848a320716
+sha256=4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c
+
 [http://www.conserver.com/conserver-8.1.14.tar.gz]
 md5=f7825728e5af8992ed4a99fb560a3df8
 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
@@ -4054,6 +4142,10 @@ sha256=71b626958e3d8927d236f462b2becd192a113d1d6d38b8d567bdc181b5069ccf
 md5=0bc06cd219410f7d4f6bbfc9bdd7c824
 sha256=71b626958e3d8927d236f462b2becd192a113d1d6d38b8d567bdc181b5069ccf
 
+[http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz]
+md5=bd30e9cf5523cdfc019b94f5e1d7fd19
+sha256=ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
+
 [http://pages.sbcglobal.net/redelm/cpuburn_1_4_tar.gz]
 md5=f9bb5ff68afb6ccfca11718c90bcab68
 sha256=1b2a1672f455545a28d0f038737e792e8c3b97789f2029f765847fc2a807244a
@@ -4526,6 +4618,10 @@ sha256=22b1f489afef6849919220591ffc51615b9cddbea61b66b43791fdeebb4dbe09
 md5=78012718a15d43e2c4952db7409c9e7e
 sha256=792776053c5842c4335d3f17d9f0c789063ad34c4fc0e2ccabbdefbd84f14726
 
+[http://arago-project.org/files/short-term/demo/demo-app-src.tar.gz]
+md5=92cea8c3ea5db7ad6073b0feb33cf911
+sha256=caf7aa9ea60947bf6fb03ecee8bf3ea2ddf250fe2486ae24b8349d6ff3b74d3d
+
 [http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.14.tar.gz]
 md5=e0b5057a4e3166f34635ac6f27c712c0
 sha256=97856d2621d4e3273340b7f1172c2e074c74263629b05bde0f0f077425ec0699
@@ -4558,6 +4654,10 @@ sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048
 md5=074cf116cc2c7194f2d100bc5f743833
 sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f78c932d673b5c13c889108d3182811a
 
+[ftp://sources.redhat.com/pub/dm/device-mapper.1.02.28.tgz]
+md5=c9ae0776994a419f9e1ba842164bb626
+sha256=24c7887fe896325a6cdc86b8beeb0d9c2de8b1c4cb20f53c2dc8f90963fc39bf
+
 [https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
 md5=c0124afc760d4fe8c24ffcf15ba7f391
 sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
@@ -4782,6 +4882,10 @@ sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
 md5=4c6f3eb03ffbd067b6d2fe2344b0d9ad
 sha256=39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin]
+md5=f6221188bea76b7aaf0c45e9bcf26329
+sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61
+
 [http://dmalloc.com/releases/dmalloc-5.5.2.tgz]
 md5=f92e5606c23a8092f3d5694e8d1c932e
 sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
@@ -4954,6 +5058,10 @@ sha256=545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184
 md5=1d70f0653b0b3a837853262dc5d34da4
 sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.0.tar.bz2]
+md5=26f6515322ec50691584ac74291b4254
+sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -5078,6 +5186,10 @@ sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
 md5=59033388df36987d2b9c9bbf7e19bd57
 sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.5.tar.gz]
+md5=e218df6c84fc17c1126d31de9472a76c
+sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
+
 [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
 md5=c7545bb05e0c2fc59174f0dc455c6519
 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
@@ -5122,6 +5234,10 @@ sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
 md5=258d0a8277ace7fab06c55fdb2b249c4
 sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.5.tar.gz]
+md5=c75f112d24bdc39c76dbec61d59a4a91
+sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48
+
 [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz]
 md5=1829b2b261e0e0d07566066769b5b28b
 sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
@@ -5274,6 +5390,10 @@ sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda
 md5=01c4c944a1b900b5b3bfa95d3a820b22
 sha256=998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
 
+[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.4.tar.bz2]
+md5=3009f30e124a2062370824bb307c5313
+sha256=21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397
+
 [http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
 md5=30e2fe5edd143f347e03a8baf5d60f8a
 sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
@@ -5830,6 +5950,10 @@ sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
 md5=1bf3ae6c0c58d3201afc97c6a4834e39
 sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 
+[http://downloads.sourceforge.net/fann/fann-2.0.0.tar.bz2]
+md5=4224efa533265dcf39237667973d0e20
+sha256=762a1313a9b935300cb66ebf052d469d04823ca721fe6dd2a49c01e13e8ab30a
+
 [http://telepathy.freedesktop.org/releases/farsight/farsight-0.1.5.tar.gz]
 md5=2aaf871471a9ec037763c5dc7c193c57
 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575
@@ -5986,6 +6110,10 @@ sha256=4fc8fbe0cf94a0d281ddc309fa91e2b6e2fb14f4cafe525d20635a196c2cc245
 md5=a556eef04aeb574ac8ab0dd8c868fcab
 sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43
 
+[http://ftp.sh.cvut.cz/MIRRORS/rock/ROCK-2.0/gnome2/figment/figment-0.3.5.tar.bz2]
+md5=4b317749c7a75c4f283c6ef5aaad4146
+sha256=ebafecd9a34dbcb83bcbf69db3e9655e92af2eb0ede33d9f92d13ed5f2e7d8b2
+
 [http://handhelds.org/~mallum/downloadables/figment/figment-0.3.5.tar.gz]
 md5=e20c642ffe7c8a492c0ddc7ee3016f44
 sha256=39fcbdea0c1e31338bca4ae60db700a3f0fce7b6cb75087abd559022e22a2927
@@ -6102,10 +6230,22 @@ sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 md5=2bfc127cdda02834d0491ab531a20960
 sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 
+[http://downloads.sourceforge.net/flac/flac-1.2.1.tar.gz]
+md5=153c8b15a54da428d1f0fadc756c22c7
+sha256=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
+
 [http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.12.36-release.i386.rpm]
 md5=8845d4536fcd3a329690c93bce9bbf8e
 sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0
 
+[http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.22.87-release.i386.rpm]
+md5=a3bb1f9a8e2b1238ffaf89193e60be02
+sha256=ec5ace49df7cfe69b7c02c8d1b6df8089f32076a390b931051feed2a9762d554
+
+[http://www.w1hkj.com/fldigi-distro/fldigi-3.11.4.tar.gz]
+md5=85457a57ac97210ee23299ccf25e5c60
+sha256=1614d6720994a5b794d50b05d95dfd1f1cc556fcd500352f0203daeae88be0dd
+
 [http://downloads.sourceforge.net/flex/flex-2.5.31.tar.bz2]
 md5=363dcc4afc917dc51306eb9d3de0152f
 sha256=701353279a17655d78e3b3678ad78d0375f5bf45877ad8b3507d589c42427f26
@@ -6614,6 +6754,10 @@ sha256=bd54e294c056c6d52b2037e91d7b2782d6805b24a74923dc80e1c9107acac707
 md5=6106c8d0aba37563b7ca9ccc94bc6c95
 sha256=44b7e18ba9ae5667dd64c89f7b04627bda5807a3a90255a125702d63c0c4ee17
 
+[http://fping.sourceforge.net/download/fping.tar.gz]
+md5=d5e8be59e307cef76bc479e1684df705
+sha256=9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f
+
 [http://downloads.sourceforge.net/free42/free42.tgz]
 md5=1fc21e04b3b77150846027dc7cb5210d
 sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a
@@ -6982,6 +7126,10 @@ sha256=7848b7c1992ef202d54a5602904e7d7e190bce0195af69174baa79e741d07e87
 md5=bc547e99535a5a05bb7093fa8b4f36a6
 sha256=32ff5fed107ca5eb94976bf22bc5b82ff45c72b8e62f35dc6dba75a2f11e6425
 
+[http://dl.cihar.com/gammu/releases/gammu-1.24.0.tar.bz2]
+md5=f805d6d93ca7064f6d04eb3c6b24168f
+sha256=dbbacb5685b84d3ee181f9172e2818ebbb3b59b088149ebf320ce0c73e71ba1d
+
 [ftp://ftp.gnu.org/gnu/gawk/gawk-3.1.4.tar.gz]
 md5=3c8935efb9fdc7202720894279ad04a7
 sha256=5cdfe0c0919895e2ec87773c583cc6ebf2b84cba7617d5ec6cfd0150749e190f
@@ -7274,14 +7422,26 @@ sha256=8e46a48d581f8b835f305bb17ffbb7776d53b9214113524819e96be842f9db98
 md5=44009c42e98943fbb868638032d5c8d6
 sha256=6b9c73f34f498b12851ac32e1225b72228e4ea629d321b0426d505ad18309e54
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-docs-1.4.3.tar.gz]
+md5=6305083c37a86f2353a8be40bcf70b99
+sha256=26e0d0aa9a24e75af57c27c5710521ed9005dcf4242d912ac0c497653b9a1959
+
 [http://geda.seul.org/release/v1.4/1.4.1/geda-examples-1.4.1.tar.gz]
 md5=9d3daac1be22186784929b56ea181738
 sha256=29e3a1b65212b30847ac5c9f3d51a3add492a1597237085279b6ff82d1a1479f
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-examples-1.4.3.tar.gz]
+md5=923fe9d9cc843b5eb7b26c91ad0ef2d4
+sha256=38a7c6d39a8b298aa1baeadaf7a174ed2ae6397ef227f19cb0bee22757b6e553
+
 [http://geda.seul.org/release/v1.4/1.4.1/geda-gattrib-1.4.1.tar.gz]
 md5=0b8bc020cacda9c3fc21bb7f49332c85
 sha256=e6ab108a7ec3b4431ffa1831a6c23937baf8a7815243d4c145e68f5ee8b11105
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gattrib-1.4.3.tar.gz]
+md5=e1f68401e7ca5fff16292358f0dfd553
+sha256=5eb48772d374dad446bfcd69990231fa6c6b52ba9b30048991632557512a7565
+
 [http://www.geda.seul.org/devel/20050820/geda-gattrib-20050820.tar.gz]
 md5=6ff8e6343b621199dde7fcd9a7ff264a
 sha256=c3b2751303d18c5d685b2d2c380065a93dab17a233657a6d1a09d9f2da64800f
@@ -7290,6 +7450,10 @@ sha256=c3b2751303d18c5d685b2d2c380065a93dab17a233657a6d1a09d9f2da64800f
 md5=b9b8dcb2818eb1fcc51002921f32b203
 sha256=66cff8c99bd0cd4d594b50c3d2cf7af35cc48adce23e6471f1926f3cc9b50d20
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gnetlist-1.4.3.tar.gz]
+md5=ef31d47010108518c6d214516f3d0cad
+sha256=0793ec9d173dbe600c14a0a8cf8b89f418271176d75b5a02e0a840a55910c119
+
 [http://www.geda.seul.org/devel/20050820/geda-gnetlist-20050820.tar.gz]
 md5=94f2a666701e06438fda0a9ce00e5ae3
 sha256=3df3a23c73df7a9c2cc553836e6df797d01da094f6a947049f9fcc182110ef43
@@ -7298,6 +7462,10 @@ sha256=3df3a23c73df7a9c2cc553836e6df797d01da094f6a947049f9fcc182110ef43
 md5=065c22125b75269188321d315ccb64bc
 sha256=6929dd56d14cfcc9fcbdd4dfc056ef8f0bab5ef72a01055fe6cda7280e59748e
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gschem-1.4.3.tar.gz]
+md5=76eef656ba4e27c6083fa29b3a5dfb08
+sha256=6952601966e0f28b9436286178a488849a78da1581c282944d2be34e9a09eec7
+
 [http://www.geda.seul.org/devel/20050820/geda-gschem-20050820.tar.gz]
 md5=8ac2387999ec98016c3b004c95fab424
 sha256=166abaa8b0c98e6c826a7c7273b7ddfb57f82be9929e4afbf00e0e3de5d45ef9
@@ -7306,6 +7474,10 @@ sha256=166abaa8b0c98e6c826a7c7273b7ddfb57f82be9929e4afbf00e0e3de5d45ef9
 md5=1dc7c628acc946731b1e67fb2b910e52
 sha256=15f99bb807dcf6116844847c72bcdde98c8c2232a0e0961cc2ff072a022ccfc6
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gsymcheck-1.4.3.tar.gz]
+md5=764613c24a752281a4f5d5432e53d0d2
+sha256=e6d9517eaea4383e724502c607d720a3cd4bf560459f5f2196e19d0c5bb3da2c
+
 [http://www.geda.seul.org/devel/20050820/geda-gsymcheck-20050820.tar.gz]
 md5=c339abc4956987852b948c44118b2e2f
 sha256=3526fd4c30f351c3d548cb2632eda150eb632846b1273349aa2061d0400f9816
@@ -7314,6 +7486,10 @@ sha256=3526fd4c30f351c3d548cb2632eda150eb632846b1273349aa2061d0400f9816
 md5=a9dda9a87edefaac2a99b70a85d0fd1c
 sha256=188d398c8e7a19bf4492419bbb44754451ebfa9f1810b0eb8b6eb84f708bf0f4
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-symbols-1.4.3.tar.gz]
+md5=e93f0c9747a66ce229702418b49e128f
+sha256=97c2dec953e21bfa2633077d084fc0b9aff0c79030f96680ebdef9f97e294cc7
+
 [http://www.geda.seul.org/devel/20050820/geda-symbols-20050820.tar.gz]
 md5=a05c9bb11a31c246be3c9a799685bb0e
 sha256=0534ccda5d9136a120abd18ebe3bccd3dbcc6414ec321ad2fd5f9258389ae13d
@@ -7322,6 +7498,10 @@ sha256=0534ccda5d9136a120abd18ebe3bccd3dbcc6414ec321ad2fd5f9258389ae13d
 md5=50d39c9af0577a42f3d769794930a74f
 sha256=dfe4d3d3033e92254aa5e00fa7ab6921589747604269bc7b01e59ba9b630e82c
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-utils-1.4.3.tar.gz]
+md5=55ab23cad7aee2e65fcc742c424e68d4
+sha256=d4814c6c11b38a3cce88b193f7a6d18cba46c44f8226716fdde53f0ccc58de49
+
 [http://www.geda.seul.org/devel/20050820/geda-utils-20050820.tar.gz]
 md5=6555466492f3273dbefb772bd4ffd486
 sha256=8140ff430e89c8564efabbc24da0d9b2858d5ac5e982dab9923eaf3b46a8aacb
@@ -8174,6 +8354,14 @@ sha256=74846344de2c24a76408ee9c598dbc75d6c33a02f888f8b5491cb1af9a097cb4
 md5=37242776b08625fa10c73c18b790e552
 sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d
 
+[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.5.3.tar.gz]
+md5=d4c9de56f77f5cd86ac67ab53e027181
+sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef
+
+[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.5.tar.gz]
+md5=02d01f1cca7ff3af511c59198f3c35a7
+sha256=4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7
+
 [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz]
 md5=eb12e6eea8413d35c033aedee61b89ee
 sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0
@@ -8326,6 +8514,10 @@ sha256=77cb4bd39a4cec2aa3d61b0519134f9e4a65613960b3b3ee34dd2452d5e12ba7
 md5=905a8df3513a519096bcf7d8efc35118
 sha256=f08d0f214db875eac602bec37b20042f0ee4f14427f9559477a040ef39003538
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnote/0.5/gnote-0.5.0.tar.bz2]
+md5=ca9e67a92945af7230eae72b2e8430ec
+sha256=19a1f79c42b37ee3c90ba6298442b52438f1c67d311ebd33db72210cee2d99d2
+
 [ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-8.16.tar.gz]
 md5=c42dfaebc37fe81eab0b5676b124ab63
 sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8
@@ -8350,6 +8542,10 @@ sha256=8418ed3a2e8dad923a6626d22eaffe796aab9cbcf827a17ab95bf99956e22a6d
 md5=3ce6ba6483ccd6fe9974cface582337a
 sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.4.tar.bz2]
+md5=338f0084f04a16f78797ad01f85d3251
+sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
+
 [ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2]
 md5=c34736eb7cb687f9e5b6d4df48aaf7c8
 sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
@@ -8382,6 +8578,10 @@ sha256=f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb
 md5=c1eb3de26b67ddc08a61a7c2fc636203
 sha256=36480bce862b6d424f4b34bbfeed838b80bcbb484602dee43c412a7d0dc4b42b
 
+[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.tar.gz]
+md5=9d91d0f8f2cb35bc86435784fa8e72d8
+sha256=a780490056b1f1f95c7bf91e175773e00f4be23e1b7e5147ccd507b6f32097af
+
 [ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.4.4.tar.bz2]
 md5=de5e060eeb2da36654e9e8af6b8b012a
 sha256=dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035
@@ -8718,6 +8918,10 @@ sha256=bc656eb1846509539bbfaf9269f07588f6f3c05c847b41b351a7571a252f6fee
 md5=8064121d3b13ea34c5fb77d2907c78f1
 sha256=4f7546bc5f8df7eb9511b919e34eb08945db4359fd3db07c555b83959923a1cf
 
+[http://gpe.linuxtogo.org/download/source/gpe-dm-0.52.tar.bz2]
+md5=ea157a2b47d932cea9738882df887ae1
+sha256=b2ef45fbe57bdc73a6a5fb244da782fc912c105453bf120128c93284fc05c4ce
+
 [http://gpe.linuxtogo.org/download/source/gpe-edit-0.29.tar.gz]
 md5=108d1739f06678d45d1529301de6a7c8
 sha256=ec3805a8d7b1577f30379f8b3bd59f5f1e1786aa574f75aa254a30bc19b6b79e
@@ -9386,6 +9590,10 @@ sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
 md5=7f4e11d04e369391de27fca82ee60f11
 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
 
+[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz]
+md5=4e327db531133ffeb650392042341443
+sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9
+
 [http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz]
 md5=75c8832f90e445ff361d767c8a2c3ece
 sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61
@@ -9542,6 +9750,14 @@ sha256=79e3618edd959e29c877b9f8b0c9156d8249d725096582dffdd5308ba6a0e645
 md5=398729b82b911eebb14156c2fa02525b
 sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.11.tar.bz2]
+md5=75a3359ece6a1c11a9e5463d79e274e8
+sha256=b50072ff6f36087b8ecebf509e6d44ab2e91292b1a3a5806a7f1437a382723e9
+
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.12.tar.bz2]
+md5=63309cf0bb21f3efd4e43868c314f919
+sha256=18387f78b721ce6b56c02f886ec89774a4e58b7883c70ab2ae6c1af58f1661c9
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2]
 md5=8545a02c408976c5e9f0c2cf3c6a362e
 sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
@@ -9590,6 +9806,10 @@ sha256=673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93
 md5=5d0f1e07f8f6db564971b50f75261e8a
 sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.23.tar.bz2]
+md5=641cc7def2d8667b9b4df15e69dba25f
+sha256=1c11d98eb9a1b1bc54becf465e74c2aa4019bb57a31dd70686269af6a9b9e93b
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
 md5=2b5958fb0baaf8d1b4eae18f7b13d49b
 sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -9614,6 +9834,10 @@ sha256=05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1
 md5=27f27151ccefad1157c9eaa322e14ac4
 sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.14.tar.bz2]
+md5=a861ccbb90a176d1242608502f45f0ac
+sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
 md5=03d3d0b5f19014fe0065234a3ea65ee6
 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
@@ -9642,6 +9866,10 @@ sha256=077bb0e095e5dd6dd16d697efd8d51761f3b5418efc808ed6ca7c60b34df51f8
 md5=031205d5599fce73fc36766f928b2515
 sha256=ced80afedd105cb9b1b72749f8bda29c71fa9eda06120d6b07e7362f705c9987
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.11.tar.bz2]
+md5=dfe2e201e066a3e86a9598b6769d9739
+sha256=681d3cf7ae124bff1949187db858e5439a41be162bdad59dd69b52b70fd62dfa
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
 md5=cf604b6acd80b57dc5173db7e93fc116
 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
@@ -9714,6 +9942,10 @@ sha256=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
 md5=35dd8598837af4074753afe5b59e8ef2
 sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
 
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2]
+md5=f7b2e300d2d85756407ec529424ab237
+sha256=cf750821040102d2c9fbfed56472a86fd0d8c24ada37901c41867c88438a776d
+
 [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
 md5=263a7800ecf44d0f38d0cbc80bce65ff
 sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
@@ -9834,6 +10066,10 @@ sha256=15aa3a926307b4b3e40f3a9b05c604df6811eb48814b1534db32aed414aefb0c
 md5=060ea25c471e5f4cf5c1baeac27d0345
 sha256=0d8b6630c546327ddc67c700859731036eebdf77e51ad8b71e4d19d28ca2ff2c
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.18/gtk-engines-2.18.1.tar.bz2]
+md5=5dc748cfb0587bb412adc49b666fb6f8
+sha256=d7e2672fcf80f5c35d481c24e0ab5b7d0f6526dcc3d8821ab76468c1816dc3bc
+
 [http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.2/gtk-engines-2.2.0.tar.bz2]
 md5=78e9276c28b509f3203de4873c20a263
 sha256=140541cae8b003d2f7210e2ef060ac328d7e45a04e2cf5fa943fff73c9955dd6
@@ -9958,6 +10194,10 @@ sha256=c1c2e1fb0168ecb3a5e773ac0cd74a0e5caeaaf402f108479337794dab8aa75f
 md5=a56ea78c74fe93a604357d7c555af0e5
 sha256=38c238ec57bf22023bbc50f70ecbaee8c06b817b9e11f1a3a0ae7faf95cc1f26
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.6/gtksourceview-2.6.0.tar.bz2]
+md5=dd065ab2e96e51aade949249c5556439
+sha256=92ddd976721e26377eaa59fea07707a0caa85eb874500868c1e6fdd9a21fe0dd
+
 [http://downloads.sourceforge.net/gtkterm/gtkterm2-0.2.3.tar.gz]
 md5=a49f93d15909dbd2e7011428ae01f0f0
 sha256=fb68b18d752ae2379f144186b94743be991af1a42c88bc1e6f0685e45cb1d573
@@ -9990,6 +10230,10 @@ sha256=1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e
 md5=a3f8216544509a74a4441f689a0410d2
 sha256=e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
 
+[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.6.tar.gz]
+md5=9e23d3dbea0e89bab8a9acc6880150de
+sha256=69a2f9491480ff756d1cc4c8ea2bdc13d40ea8ddc8f93f26957bade8219a1d86
+
 [http://gupnp.org/sources/gupnp/gupnp-0.12.2.tar.gz]
 md5=5350f5f28fb3742779702a496ab75d72
 sha256=9e4edb3ca6d11e397d9f98537fa8954851dc044d13ecafd4f4547117cefbdd28
@@ -9998,10 +10242,18 @@ sha256=9e4edb3ca6d11e397d9f98537fa8954851dc044d13ecafd4f4547117cefbdd28
 md5=91b4337d22f6dd931888a33553ab945a
 sha256=f78e4b0a361b67805892c1a0e72f3cef92fbc96112157895660a478979ddeef4
 
+[http://gupnp.org/sources/gupnp/gupnp-0.12.5.tar.gz]
+md5=bfb12195c76bb6632bd917f2c2bc12d6
+sha256=241e416cbe2c02f413fde82a8587bfe2fe9915fbed3a6fb20c86520b8d7543ef
+
 [http://gupnp.org/sources/gupnp-av/gupnp-av-0.2.tar.gz]
 md5=ab485bf263d0a3d2f771817241c970b9
 sha256=782e4e45abcba1b3fe34276580653f4dbfbe8a26eee69a290675dfa7faa309f8
 
+[http://gupnp.org/sources/gupnp-av/gupnp-av-0.3.tar.gz]
+md5=f6e813591ff89e8e61a46f416046450f
+sha256=34b6e104b480e501e430daa68fca63906a939a6cb02bc43814ed06d2856a72ac
+
 [http://gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.1.tar.gz]
 md5=27d3a55eae2243661f49a7cf40e1e195
 sha256=c4004de997674bb54d5844391dd824c6aee78184b075e7ea5d8f816e0d031e25
@@ -10030,6 +10282,10 @@ sha256=7249197b75a61c36398f7458f12c0318ccf03639ae8404771fb4ff414fa17683
 md5=0d123f87e3e660271cd9d11b8c592c5a
 sha256=67e7dd1dca32a99eb1102a853d2df1bac782d50a4361511409572cfe8ea51147
 
+[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/gvfs-1.0.2.tar.bz2]
+md5=04c44757a265f787d6606655b6bbc593
+sha256=f3606dc28b1fa140c7d0191478097a89f7ef7a3183a811a1410a230052b71eb4
+
 [http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/gvfs-1.0.3.tar.bz2]
 md5=a41e8b7d99e390cef8312f7ce5f312a5
 sha256=17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
@@ -10058,6 +10314,10 @@ sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
 md5=3d6c191dfd2bf307014b421c12dc8469
 sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
+md5=3d6c191dfd2bf307014b421c12dc8469
+sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
+
 [ftp://ftp.us.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
 md5=3d6c191dfd2bf307014b421c12dc8469
 sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
@@ -10078,6 +10338,10 @@ sha256=b011f194e1ab90e753744405bb5b85949cdda1a02320cb174b8d4a8e5e182dc3
 md5=750cf074e88b6fb7012f26d99cd39b9b
 sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
 
+[http://hal.freedesktop.org/releases/hal-0.5.12.tar.gz]
+md5=bb7c36e142437f7363f9a80ae8391926
+sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02
+
 [http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz]
 md5=3b351822ba359669646026013a3d5a03
 sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17
@@ -10106,6 +10370,10 @@ sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 md5=a6f532770cf9286e1de38d6570cbc6bc
 sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 
+[https://fedorahosted.org/releases/h/a/hal-cups-utils/hal-cups-utils-0.6.19.tar.gz]
+md5=58e1c8f5597dd39e57dcf3c4aabe60f8
+sha256=f40a7ebd1453d471a8a6bfd8c635708dd739a6160bb661813f936d936ba85618
+
 [http://hal.freedesktop.org/releases/hal-info-20070618.tar.gz]
 md5=c7005ccb1765d8359fd2348350770495
 sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
@@ -10122,6 +10390,18 @@ sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9
 md5=6fc99d15d38945c17a291ea93e664664
 sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0
 
+[http://hal.freedesktop.org/releases/hal-info-20090414.tar.gz]
+md5=ae7177ab8f0163d3ef2df71f0de2b357
+sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f
+
+[http://downloads.sourceforge.net/hamlib/hamlib-1.2.8.tar.gz]
+md5=74eaf1be4cf1cbdecee54808c6930788
+sha256=be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81
+
+[http://downloads.sourceforge.net/hamlib/hamlib-1.2.9.tar.gz]
+md5=9515288826284d6c8dd569354dacc8e0
+sha256=ba75e64e1b6d5ffaa41e2063e475eca5b35ad68cb4ee6e888e0fc73bd6fa9fba
+
 [http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz]
 md5=488b0f2f346361bba7996b459c5d7b6f
 sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3
@@ -10474,6 +10754,10 @@ sha256=bedfd45364948a08ecaa212c5eda6667a83ac8bb547e2eb8478ade885898cad7
 md5=f720686c841e9fefc06db76458fd9908
 sha256=1f8259a3a8ae583170816f5028329f3a7157f87f927da9c0a911a5fb9be263a1
 
+[http://www.netsurf-browser.org/projects/releases/hubbub-0.0.1-src.tar.gz]
+md5=58c6e2b5a5906f3f0bf136c0c71b5403
+sha256=3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf
+
 [http://cvs.haskell.org/Hugs/downloads/Nov2003/hugs98-Nov2003.tar.gz]
 md5=e80a6739ead9a260087fe4d3fc6a8359
 sha256=9f90613de73e1b8e90d9bbcb09046e83680f15a46fc630c3e26e9aa4ca0e6a1d
@@ -10702,6 +10986,10 @@ sha256=11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9
 md5=82e7c8fdb6211839246b788c040a796b
 sha256=a606e230b22d9d029998b84e5d6311a8ba35a304fe457e254eb5fd19943cd639
 
+[http://arago-project.org/files/short-term/demo/images.tar.bz2]
+md5=a080f5a4ed42c56767c07e55c1266727
+sha256=9c6f58c44051563a788f7e9202957d839822081d99ecb001314265166c20eb95
+
 [http://xorg.freedesktop.org/releases/individual/util/imake-1.0.2.tar.gz]
 md5=b5c3a719d60a14ca2378dc1259ee60df
 sha256=8008b4366ab96abfdac2c91808b79ec2cc5649966b41cfb07b14b6fbd798651c
@@ -11006,6 +11294,10 @@ sha256=3b3960f867bf878a6561428a3c572e87dcccadb7123aa47d7aaca77b32adecc8
 md5=20ef2767896a0f156b6fbabd47936f79
 sha256=3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a
 
+[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.29.tar.bz2]
+md5=a3ecfaa091289656fae786b027b44eda
+sha256=ff7b78ebb112ebeb3901fe36823328c4af89040b890c25db43d8e35ccbc663b3
+
 [http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.5-rc1.tar.bz2]
 md5=74fc66f01937076f65079e194dd2b0d0
 sha256=325bfc9607ccf56e7de0e7973e18fac76678e50b8cf24d3818b4feb734a0e45d
@@ -11046,6 +11338,14 @@ sha256=84ac04a28ae41e17df0f181d8bc0049ae7a83baae07296e890ea5977a2952318
 md5=0a9209f928002e5eee9cdff8fef4d4b3
 sha256=c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
 
+[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0-6.diff.gz]
+md5=fe0e2944addbd5803b42e91f7e4ec5d7
+sha256=5803c3f3653887896b75567daf617a8f200cecdd28beb870219b3954d9931efa
+
+[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0.orig.tar.gz]
+md5=377371c28ee3c21a76f7024920649ea8
+sha256=9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163
+
 [http://downloads.sourceforge.net/iptstate/iptstate-2.2.1.tar.bz2]
 md5=6b08f09b9917f644629efea1febec4b3
 sha256=004f8358f4f84d90a260a76ac46ce8512126ac490d73460fcee6c11effd34362
@@ -11122,6 +11422,10 @@ sha256=47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c
 md5=e407b557b3cfc7c91ce4de2571dd79cb
 sha256=462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0
 
+[http://www.irssi.org/files/irssi-0.8.13.tar.bz2]
+md5=0d6fc2203832b514eff014fffd574664
+sha256=896541ac837421290934e2658ab364d4d3f0326259489a94a0cd166e2b05d735
+
 [http://heanet.dl.sourceforge.net/iscsitarget/iscsitarget-0.4.16.tar.gz]
 md5=c7ea3192f1717b40e4c483c9d630082d
 sha256=e6605ae5f9ed2e2fdbe84df967236678579a4fbe536b75a93277cbb607bead7d
@@ -11182,26 +11486,6 @@ sha256=4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566
 md5=b941b8f4de297827f3211c2cb34af199
 sha256=79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d
 
-[http://downloads.sourceforge.net/jamvm/jamvm-1.3.0.tar.gz]
-md5=4f0af6c15f1b9fc50375d30a422bc88f
-sha256=445813850236d5ea54942df45046ee9414192b403fb8fb1b8e7cfce0f3ace761
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.3.1.tar.gz]
-md5=cceb887aec78fee99773949ede34759e
-sha256=3a089c19c49e0e29f319d60afac73708a80a22ac42a9728316193e680f4cec5d
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.3.2.tar.gz]
-md5=f63b7cf4b541a144c41f17fffb7cc869
-sha256=6740f2cef6a2620bc5959eb65562866ffb5c45050a04555aed244abcbe30f88d
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.4.1.tar.gz]
-md5=ed79d6b60e50b007614831f8c28321ac
-sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.4.2.tar.gz]
-md5=c7affcc61d4135ee838121a57b08de0f
-sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
-
 [http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz]
 md5=3f538bab6e1c77aed331e5e71f754f5b
 sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
@@ -11230,6 +11514,10 @@ sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
 md5=2a564045670b459e9aed857b5f8a3391
 sha256=76c976616d344a3b1abd8896be6610c4d97a58af6960e1bc2f442b774bdda839
 
+[http://downloads.sourceforge.net/jamvm/jamvm-1.5.3.tar.gz]
+md5=ce886163658d748113b0570dfae12aea
+sha256=f2795ab62635df1c9bc6c4a7b90f53d0d846c0c26f5ec7b352f687506407ebd8
+
 [http://downloads.sourceforge.net/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz]
 md5=1282913edd226bc9e865f39d79573117
 sha256=3c884982ebf40aade899379902ec92c41782d18c19506cf0ec40bcf6a7df8e3b
@@ -11274,6 +11562,10 @@ sha256=f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca
 md5=4e979c0dda766ba1dd719905ca975c7b
 sha256=202de62e2f3d0667cc464720d5897d0ccb29767ec24e0a4d4c5bd6c4d37425a4
 
+[http://download.java.net/dlj/binaries/jdk-6u10-dlj-linux-i586.bin]
+md5=b70924c697584ab7955050d7a9b4de57
+sha256=dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
+
 [http://www.jdom.org/dist/binary/jdom-1.1.tar.gz]
 md5=22745cbaaddb12884ed8ee09083d8fe2
 sha256=a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056
@@ -11386,6 +11678,14 @@ sha256=c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534
 md5=cd1eb1ce62a52cf69f4df9041a886794
 sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576
 
+[http://clayo.org/kanatest/kanatest-0.4.8.tar.gz]
+md5=b97b0521314f634e454354cb7ba2013d
+sha256=a31682604bc6db9c0cb2e15429b8a5b64c04f1ed96df912cab71d4337567c513
+
+[ftp://ftp.debian.org/debian/pool/main/k/kanatest/kanatest_0.3.6.orig.tar.gz]
+md5=cd1eb1ce62a52cf69f4df9041a886794
+sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576
+
 [http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz]
 md5=bdfe75534322840b3ff566e0a91c472d
 sha256=28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1
@@ -11478,10 +11778,18 @@ sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
 md5=bf87c53f36b4454ad3cc50aa9c72faf3
 sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2
 
+[http://kexecboot.home.linuxtogo.org/kexecboot-0.3.tar.gz]
+md5=3c3b8edb739146183b3ddff3e0af5f1c
+sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
+
 [http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz]
 md5=3c3b8edb739146183b3ddff3e0af5f1c
 sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
 
+[http://kexecboot.home.linuxtogo.org/kexecboot-0.4.tar.gz]
+md5=b4a4509ca3f546cfedd23aa6f99ab81d
+sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
+
 [http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.4.tar.gz]
 md5=b4a4509ca3f546cfedd23aa6f99ab81d
 sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
@@ -11490,6 +11798,10 @@ sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
 md5=b4a4509ca3f546cfedd23aa6f99ab81d
 sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
 
+[http://kexecboot.home.linuxtogo.org/kexecboot-0.5.tar.gz]
+md5=a937303d7ef3fc645f9dccf89e1494e2
+sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
+
 [http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.5.tar.gz]
 md5=a937303d7ef3fc645f9dccf89e1494e2
 sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
@@ -11526,6 +11838,10 @@ sha256=1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b
 md5=2100c667e69db0cde35fa2d06c8516e2
 sha256=023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
 
+[http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz]
+md5=6ee365d36354b4dee4945e67f8149294
+sha256=a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
+
 [http://kernel.org//pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2]
 md5=6c96f954676c7b898dfe230e0f2a1fb5
 sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e
@@ -11626,6 +11942,10 @@ sha256=7a2162c783f98a2de9658a217cd0409a7bd16d40040c34a6077df376a2135aea
 md5=56a9be3b788ad32a169069f332ebf0f3
 sha256=cc1fc10fe3e8473efd3af315a47500d646665554fe6fe5993028adb1f189334b
 
+[http://www.latencytop.org/download/latencytop-0.4.tar.gz]
+md5=ad8d107699608b024d697c941371bb37
+sha256=4c5bb829390f266f6ba4430b725a4210d7e71d96168731dfd790c0f945c317b8
+
 [http://downloads.sourceforge.net/lgames/lbreakout2-2.6beta.tar.gz]
 md5=41d6e0be4654b1716b1b3f5b53abf014
 sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8
@@ -11742,6 +12062,10 @@ sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
 md5=48a403c45be2206ee900729ced3a0e62
 sha256=ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e
 
+[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.2.0.tar.bz2]
+md5=d58b5a03ba36c661ff48f38048c2edd3
+sha256=82f9b9dff544fc3d8bcda5878930cdc3817d478f34b3790c599fe185c138f160
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libAppleWM-X11R7.0-1.0.0.tar.bz2]
 md5=8af30932ebc278835375fca34a2790f5
 sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
@@ -11850,6 +12174,14 @@ sha256=bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c
 md5=d1512d65dadd4f48c779d4749e7753a8
 sha256=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.1.tar.bz2]
+md5=2f2beb98e71f397e1209beaca4e97cb1
+sha256=d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
+
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.tar.bz2]
+md5=c6265b59ea2b594fd68e33f9125b4d20
+sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2]
 md5=dcf59f148c978816ebbe3fbc5c9ef0e1
 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248
@@ -11906,6 +12238,10 @@ sha256=45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514
 md5=73671d8f1cf36fdd81395328cc3539c9
 sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.5.tar.bz2]
+md5=64e7782db4653cb57c7f7e660b2431c3
+sha256=2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
 md5=ded3c7ed6d6ca2c5e257f60079a1a824
 sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
@@ -11998,6 +12334,10 @@ sha256=2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0
 md5=a91f1f722ac80c597cf0b75dcb8b48c0
 sha256=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.5.tar.bz2]
+md5=aa11d859cc8e9a0bad3bb55e1666547b
+sha256=1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXext-X11R7.0-1.0.0.tar.bz2]
 md5=9e47f574ac747446ac58ff9f6f402ceb
 sha256=5ccefe638c3dfc12fd8c2f2de38ec7e0e0b54bb271fa75f687e474a58edbad28
@@ -12046,6 +12386,10 @@ sha256=c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2
 md5=4f174b9613f87cf00d731da428a1b194
 sha256=6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.0.tar.bz2]
+md5=3a8e06b25912ef339d70a8ba003da9b5
+sha256=eafff0157f2c7172214449d4b6b0c72328cad7026ecace226189b511791c5f75
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfont-X11R7.0-1.0.0.tar.bz2]
 md5=955c41694772c9fd214e3e206f5d2178
 sha256=47d4de6986f6ca85bc48ecd76188d7f3f009e1aeb640008cab12ac5ca5896622
@@ -12098,6 +12442,10 @@ sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
 md5=4b88e07d7dd77ca1e786f09066b58c02
 sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.1.tar.bz2]
+md5=cfb36307e8e7ffafe40848dba24e0b11
+sha256=a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
 md5=99503799b4d52ec0cac8e203341bb7b3
 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -12190,6 +12538,10 @@ sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
 md5=5cd67cc02a50c9644ba0a1846ea3b08e
 sha256=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.0.tar.bz2]
+md5=68eb59c3b7524db6ffd78746ee893d1d
+sha256=5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2]
 md5=e10aed44c2e1e5d9e6848a62ff2c90c7
 sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb
@@ -12398,6 +12750,10 @@ sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
 md5=f619b4f01aeda6d5f2679be9dcec5a51
 sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
 
+[http://downloads.sourceforge.net/libassa/libassa-3.5.0.tar.gz]
+md5=9b61dfd94bf4e083829ffb0231243d8b
+sha256=72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314
+
 [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz]
 md5=db4e6939fafbaae80cab11a67f28771d
 sha256=c72dc7b2a3bb2945d1fb693b401ddff44f3eefbe248f2e6d29c86487b69c1dd4
@@ -12910,6 +13266,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844
 md5=16f2e3176eb489838bad57c8728c7388
 sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d
 
+[http://geda.seul.org/release/v1.4/1.4.3/libgeda-1.4.3.tar.gz]
+md5=f4254f345b5d1a1f3ae4e2e27ae38b0a
+sha256=f3687c7308231634619de278b5880cccd6b9b3fc04a4c1b1cf8b2e3131f6f158
+
 [http://www.geda.seul.org/devel/20050820/libgeda-20050820.tar.gz]
 md5=356182f379af726045a70de3024c7e6d
 sha256=c2fdec2c186c11aac2f941dc238ee89f51412707bd7c952e02faefa70e38d700
@@ -13414,10 +13774,14 @@ sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 md5=e5808ad997ba32c498803822078748c3
 sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
-[http://josefsson.org/libidn/releases/libidn-0.5.19.tar.gz]
+[http://alpha.gnu.org/gnu/libidn/libidn-0.5.19.tar.gz]
 md5=440835808c577073db7d571357223dce
 sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
 
+[ftp://ftp.gnu.org/gnu/libidn/libidn-1.15.tar.gz]
+md5=482a25b7b223e52f967fafd284a1a992
+sha256=db75022eff366bd5646ab1e6d7bcd1c2048473a7dbdf0cd0421de92c88bbdc18
+
 [http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-1.16.tar.gz]
 md5=7dfcd9ac3a4ff41038a2c67a733d42b9
 sha256=1a64895c9a6cdbb5cdfff81f1520541fee28e85fb940d9b0484de656d69ae8f5
@@ -13514,6 +13878,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea
 md5=6a4db221129f230c64a0f937d00bb703
 sha256=003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2
 
+[ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.2.tar.gz]
+md5=2853d8f32417e3c5f3b18fda38f96e52
+sha256=1e095469f7d159e5b9c91106484e10f0b3ce3265c55b9864407bd4ea5952111f
+
 [http://mikmod.raphnet.net/files/libmikmod-3.1.11.tar.gz]
 md5=705106da305e8de191549f1e7393185c
 sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929
@@ -13686,6 +14054,14 @@ sha256=15b0492ac252f6e8ce57c106bda0722413196d16d198c97f20a05908d1b977af
 md5=ba76f68b7e3bd284ac2c2a1b9c5ecb06
 sha256=2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856
 
+[http://www.netsurf-browser.org/projects/releases/libnsbmp-0.0.1-src.tar.gz]
+md5=61e1e5703580c1bc7d950a1aacea7bad
+sha256=424d12aae7a6ea8c90438cf4ccff486dc01a3a2a7b68eb602ee2b8c28178b6d1
+
+[http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz]
+md5=a547da766fccacd00fd05190baf644da
+sha256=54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52
+
 [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
 md5=85b6a42a9e17a23c01b2f2ed0ece0563
 sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
@@ -13898,6 +14274,10 @@ sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f
 md5=7075f580606a84e63b7d6d9fa3124c31
 sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
 
+[http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz]
+md5=5999c2d52f8c07eeef2a8808fee4f858
+sha256=5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165
+
 [http://www.at.tcpdump.org/release/libpcap-0.9.3.tar.gz]
 md5=0ad921c881fdd3d278046afcd352a151
 sha256=f20d19b1f32e4ee465169ff1e17a3755bfda8c697cfed11fe36cbf6959c80441
@@ -13926,6 +14306,10 @@ sha256=a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
 md5=6d5468debf76fac84576ca26c9535821
 sha256=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc
 
+[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.6.tar.bz2]
+md5=ba25eb7582f69428648e8c67564d68e5
+sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
+
 [http://www.xmailserver.org/libpcl-1.4.tar.gz]
 md5=6d63c462911349de80109c0161ed6d37
 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
@@ -14026,6 +14410,10 @@ sha256=ff30a5f1a99c61caebcdce9f59417b3f7a0dbed15c6786368f4a4a1d05c67eb1
 md5=aae602677ce201b1a0ed6a0c18c207f2
 sha256=2bfc1853ecdc545bf3767ed92c93b8796f2075f522c8eab1693c96f11d55a59e
 
+[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.26/librsvg-2.26.0.tar.bz2]
+md5=65dbd726a514fe8b797d26254b8efc1e
+sha256=fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea
+
 [http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.6/librsvg-2.6.5.tar.bz2]
 md5=2d1d16f9493c80ce8214e585727334ae
 sha256=11b97cbc654e366adedc28a93e334d34d46365b09a3adb028449119ab67cd643
@@ -14046,6 +14434,10 @@ sha256=6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6
 md5=06861c2c6b8e5273c9b80cf736b9fd0e
 sha256=98b8766323c78b7b718dfd4ef6b9292bbf0796b742abb2319b8278cbeee731d4
 
+[http://www.mega-nerd.com/SRC/libsamplerate-0.1.7.tar.gz]
+md5=ad093e60ec44f0a60de8e29983ddbc0f
+sha256=e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c
+
 [http://gpe.linuxtogo.org/download/source/libschedule-0.14.tar.gz]
 md5=f4fd8f525e2cd4100db89bd6b4f92934
 sha256=d86d490bada35c041b1134b15f1abc94364c798dedc974d2c5ff2127d1b80487
@@ -14150,6 +14542,10 @@ sha256=79e305112a4d9598b93b614a7747604f9ef10d9a2dee52c5903b554bbeaedd7c
 md5=2d126c35448503f6dbe33934d9581f6b
 sha256=1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2
 
+[http://www.mega-nerd.com/libsndfile/libsndfile-1.0.20.tar.gz]
+md5=e0553e12c7a467af44693e95e2eac668
+sha256=7517eb966579f8814b5efe307cb919c5b4e7b5c6729209ba1da95f31e8368dc7
+
 [http://seafelt.unicity.com.au/downloads/libsnmp-0.1.1.tar.gz]
 md5=752653ae88159a00c796c891af334f1b
 sha256=13447233b19f7a9d4e14b362f28f1dbe4bb6652bdc182bba974234b0bc15e791
@@ -14194,6 +14590,10 @@ sha256=30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
 md5=9df9d2b3304213641d3214a774d75ee1
 sha256=47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.26/libsoup-2.26.2.tar.bz2]
+md5=61abd9bf1435e37def0956248a03832c
+sha256=afcedda15bde2395dec31a82a243871a0540ea2e13e7a14d15846ad0c1f09a7b
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
@@ -14458,6 +14858,10 @@ sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176
 md5=df2447c23750ef2b4a314200feacc2ee
 sha256=c9bdc5820bc283dcfefba4d4f632c9083adffe5a06c21e089ee123209d229ecf
 
+[http://downloads.sourceforge.net/libusb/libusb-1.0.1.tar.bz2]
+md5=8fb0e066678a0d294894b5b2969cb4b3
+sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45
+
 [http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2]
 md5=3d9f7c3966d24c6e2d58becac96e4e27
 sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49
@@ -15074,6 +15478,10 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 md5=64921b5ff5cdadbccfcd3820f03be7d8
 sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.tar.bz2]
+md5=7a80058a6382e5108cdb5554d1609615
+sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -15286,6 +15694,10 @@ sha256=138b70379317b4d2962694879c26f7579f7771256bd67d462012bed17f1fcba5
 md5=9b9b6da3612b629f40b97d295c8854f0
 sha256=aeab92eb4f81b3ae12a1d4e3d8d9b3650cc0f37ce7f9d1562c29364567d87acb
 
+[http://archive.apache.org/dist/logging/log4cxx/log4cxx-0.9.7.tar.gz]
+md5=fd09abc90b8c0c8af1d5146a75590792
+sha256=5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6
+
 [ftp://ftp.logilab.fr/pub/common/logilab-common-0.37.1.tar.gz]
 md5=39561a45c74f8ff11e2ddd872f4ee5bc
 sha256=c5974c1e98bed62bb3153a8144069c43229c6b208ef599bc77c84fb493c2291b
@@ -15634,46 +16046,90 @@ sha256=847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8
 md5=26c31e8e1528fd098e3aaa11c0d34d99
 sha256=847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r1844-20061208.tar.gz]
+md5=9ab58ff1c9b3803f76b064eba3555679
+sha256=da423f508cc3624a1f510e9c153ebb7c5413e765546e9d44d55818358862cc64
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r1844-20061208.tar.gz]
 md5=9ab58ff1c9b3803f76b064eba3555679
 sha256=da423f508cc3624a1f510e9c153ebb7c5413e765546e9d44d55818358862cc64
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2100-20070210.tar.gz]
+md5=e7e0f50615b48c4ea70e6d219d141728
+sha256=49d42bcb9e13534f357240890c4e6b344e5f2fe951d5d39bc4caee55fdf3c5b7
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2100-20070210.tar.gz]
 md5=e7e0f50615b48c4ea70e6d219d141728
 sha256=49d42bcb9e13534f357240890c4e6b344e5f2fe951d5d39bc4caee55fdf3c5b7
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2156-20070225.tar.gz]
+md5=8cee25705f94e1ffcf84cc084d5a6996
+sha256=d609af1a5bb6ecf6b00ae89ef338c607ee7f9ddba693085c3b7773f9be00b2e0
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2156-20070225.tar.gz]
 md5=8cee25705f94e1ffcf84cc084d5a6996
 sha256=d609af1a5bb6ecf6b00ae89ef338c607ee7f9ddba693085c3b7773f9be00b2e0
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2182-20070308.tar.gz]
+md5=8e6f80c2e5cc828b6cceeda1c66c687d
+sha256=d509a0d9cb791c0633c35b48c502fc972990ba0dcb963690edbe3261704d0af0
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2182-20070308.tar.gz]
 md5=8e6f80c2e5cc828b6cceeda1c66c687d
 sha256=d509a0d9cb791c0633c35b48c502fc972990ba0dcb963690edbe3261704d0af0
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2187-20070309.tar.gz]
+md5=a43d24457cb99fcf4c32c31923be9b6a
+sha256=955d5382d079327679c3a601361fb752f1caf2f8a832f1c1bffe945708e37dca
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2187-20070309.tar.gz]
 md5=a43d24457cb99fcf4c32c31923be9b6a
 sha256=955d5382d079327679c3a601361fb752f1caf2f8a832f1c1bffe945708e37dca
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2702-20070903.tar.gz]
+md5=b65e6b712836cd0121bd1746e8920d10
+sha256=46a30f2cd62c66099d4b87a32fb82751598758c213a1486ec7f44c23a33f5529
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2702-20070903.tar.gz]
 md5=b65e6b712836cd0121bd1746e8920d10
 sha256=46a30f2cd62c66099d4b87a32fb82751598758c213a1486ec7f44c23a33f5529
 
+[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2826-20071105.tar.gz]
+md5=fe1758398de89fce57f05f9c1d1bb923
+sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb
+
 [http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2826-20071105.tar.gz]
 md5=fe1758398de89fce57f05f9c1d1bb923
 sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb
 
+[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-ng-r3314-20080131.tar.gz]
+md5=2c7352cbbdac995de8c3bce5b80db5f2
+sha256=0599c75b95ba63bdc554cb8124192e62c75fbeb71b9e8a5a7bc351c8e0666758
+
 [http://snapshots.madwifi.org/madwifi-trunk/madwifi-ng-r3314-20080131.tar.gz]
 md5=2c7352cbbdac995de8c3bce5b80db5f2
 sha256=0599c75b95ba63bdc554cb8124192e62c75fbeb71b9e8a5a7bc351c8e0666758
 
+[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz]
+md5=d6e04fa7fb0bea5079f24a753633fb29
+sha256=d504e1e7b8f0d01b5441a86d1086aa4088c8896d87d8aabd6dabace76997467a
+
 [http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz]
 md5=d6e04fa7fb0bea5079f24a753633fb29
 sha256=d504e1e7b8f0d01b5441a86d1086aa4088c8896d87d8aabd6dabace76997467a
 
+[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-trunk-r3878-20081204.tar.gz]
+md5=bf12d0f9f306dad91bf7530586712dee
+sha256=3b8ea233bee05edc346c66577b6beb5ccc81db9d9440982624d7b39aecc79c77
+
 [http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3878-20081204.tar.gz]
 md5=bf12d0f9f306dad91bf7530586712dee
 sha256=3b8ea233bee05edc346c66577b6beb5ccc81db9d9440982624d7b39aecc79c77
 
+[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-trunk-r4029-20090525.tar.gz]
+md5=aa88865c0fd11a0c0736af17a13c4f5a
+sha256=d42b59fdac3972a9b0876789ed61e78ea13c34fefe7d819ac0fbf748070fecef
+
 [http://repository.maemo.org/pool/maemo4.1/free/m/maemo-af-desktop-l10n-public/maemo-af-desktop-l10n-public_5.0+r6160.tar.gz]
 md5=5e13cc37619d6a79459ef1b36d671597
 sha256=28d1dbeb0c6db7a4155fb87c838b0d814e583147fb0cc23bdf64691014f69add
@@ -15826,6 +16282,10 @@ sha256=bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760
 md5=1775f4ab1529db175a95f83bacc562b0
 sha256=e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135
 
+[http://kernel.org/pub/linux/docs/man-pages/Archive/man-pages-3.21.tar.bz2]
+md5=14b3f971348f4d59ae8b8362d8eb15ff
+sha256=272ac90813e4301873d46229b216622bb7bc6a0b3adb15577b20b5083f92a169
+
 [http://www.maradns.org/download/1.0/maradns-1.0.39.tar.bz2]
 md5=5ac39978f55ecaf6e887cd5be027b1c3
 sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394
@@ -16226,6 +16686,10 @@ sha256=cea3848006631801709588b8ae6808dbc768f62b6da4085073075f276309fd0d
 md5=afed64074b2ed195aae171b2178650e1
 sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f
 
+[http://goodies.xfce.org/releases/midori/midori-0.1.7.tar.bz2]
+md5=c6299ecf93417526f37bc0154c18b126
+sha256=9b74a776831c3680c10ad5c3d04985a1368c4fdf2f383a0e8efcc3cda925baaf
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
 md5=d50f0a9683dee60685bcd48e04970949
 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
@@ -16806,6 +17270,10 @@ sha256=af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e
 md5=3e68b857b4e1f3a6521d1dfefbd30a36
 sha256=af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e
 
+[http://ftp.gnu.org/gnu/mtools/mtools-4.0.10.tar.bz2]
+md5=750c2beba968a5d46dbaae24551a82b9
+sha256=860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded
+
 [http://downloads.sourceforge.net/mtpaint/mtpaint-3.02.tar.bz2]
 md5=828013176f135fc24ffdf16a011c51e6
 sha256=991a1376dc23d0663d45b3b395c0e5c5542fee3906a120889583d67f854f5206
@@ -16846,6 +17314,10 @@ sha256=636d816aa4c7e754496b9daec8a00d7e5f62b67d640440c91dea6d694c83c944
 md5=b2c1eb45fd958f6589ee52a98f2a3ce1
 sha256=03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
 
+[ftp://ftp.mutt.org/mutt/devel/mutt-1.5.19.tar.gz]
+md5=73b3747bc7f7c805921e8d24ebac693f
+sha256=b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
+
 [ftp://ftp.mutt.org/mutt/devel/mutt-1.5.4i.tar.gz]
 md5=3d4088f25892af6d71148eef26604f33
 sha256=f89af1816b839736eaf5fd188c4574fc52bdd37a7dabc465edafe6d8c3914847
@@ -16974,6 +17446,10 @@ sha256=a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1
 md5=bc7995b4961385269abc645575bcaf4d
 sha256=a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1
 
+[http://www.tux.org/~mayer/linux/nbench-byte-2.2.3.tar.gz]
+md5=285dfab361080759d477ea1fe7d3093a
+sha256=723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac
+
 [http://dev.yorhel.nl/download/ncdu-1.3.tar.gz]
 md5=204bacb8376819059bec6c8287a87a67
 sha256=f556a4b07c07bb66eabb5f2a20b3c52ea22020a68f2b5302d03e7b93b0ffee54
@@ -17106,7 +17582,7 @@ sha256=e42d3b3f30de0c1ad0a86aa039b35cf2bf64c7f64c29ee333cbf934784639973
 md5=18ed6d0f1adf75a748df55d5e924fabb
 sha256=e42d3b3f30de0c1ad0a86aa039b35cf2bf64c7f64c29ee333cbf934784639973
 
-[ftp://ftp.netperf.org/netperf/netperf-2.4.4.tar.bz2]
+[ftp://ftp.netperf.org/netperf/archive/netperf-2.4.4.tar.bz2]
 md5=0e942f22864e601406a994420231075b
 sha256=28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497
 
@@ -17130,6 +17606,10 @@ sha256=844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7
 md5=36f7b3120e00c9c74cb6619334de419f
 sha256=6eed89b661ae9f2ac0d383414ca964abea8a115f8fba0f7ab37b49b565ffb2a8
 
+[http://www.netsurf-browser.org/downloads/releases/netsurf-2.1-src.tar.gz]
+md5=f0a34fd076b492c1a13b45432e8d7e49
+sha256=cda2cf41c852938c226c47c2b995d527387120141f68b416ea745e50a7165a81
+
 [http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.6/network-manager-applet-0.6.5.tar.bz2]
 md5=1c94a41e2399d261985a75f0cd3b895b
 sha256=9cca3e34e23f00c82bc5e7237aa81639874e90d43a689e26fbfd938279ca31c9
@@ -17262,6 +17742,10 @@ sha256=58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db
 md5=917f4e05f3982bd7fceaede197f0e1d4
 sha256=d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b
 
+[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz]
+md5=03938f17646efbb50aa70ba5f99f51d7
+sha256=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
+
 [http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz]
 md5=f384fb230145f90fb75df1e33062583f
 sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5
@@ -17378,6 +17862,10 @@ sha256=aa567d986c74a4c8b4abb1cc454c099f67ab01b049b4c69aa6e703c7f18b594d
 md5=b9fbc1386b24f59b36aeb9d764c11fb5
 sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.13.tar.gz]
+md5=8764dcbcd7b5ed80e17b1279a82701b0
+sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -17538,6 +18026,10 @@ sha256=908a69340b020f7d865acf70724e37837016a81a0cb499fb83441759cbef7616
 md5=8347c8980ccf6cc46039ca75e8b0f543
 sha256=f9bd3921377ab64138c7dd550d5753e3668e99de37d743cf112b88ad933d4420
 
+[http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin]
+md5=a231257e79fffbd4aa87dde13642df4c
+sha256=92ecc9be2c638220ebbd7de467a0944d49f1bef84b977421709afadd4508c2b9
+
 [http://www.devzero.net/openmoko/dist/omext-0.2.tar.gz]
 md5=3c1fcd85f0a0cd3ccc4d7b4f26996b47
 sha256=3d3cc3e4f92f7e0b6a352c3f68a337a599a90f4e4b6e6743adc0c70b570639f5
@@ -17570,6 +18062,10 @@ sha256=c11daf4e0baf1bc70d30411944f9a3238d61e3c1972c33443dbe0cb078cfe2d7
 md5=c2b4f12822cef2182267ea0d020bddf6
 sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
 
+[http://downloads.sourceforge.net/opalvoip/opal-3.6.2.tar.bz2]
+md5=88076eeadee1351704afb2aeb3532c17
+sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca
+
 [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz]
 md5=641cf53761f35ee979f3e888614797a0
 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
@@ -17694,6 +18190,10 @@ sha256=4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f
 md5=6a7fa99f44d9e1b5b04d15256e1405bb
 sha256=7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a
 
+[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.2p1.tar.gz]
+md5=ada79c7328a8551bdf55c95e631e7dad
+sha256=4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae
+
 [http://www.openssl.org/source/openssl-0.9.7e.tar.gz]
 md5=a8777164bca38d84e5eb2b1535223474
 sha256=25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c
@@ -18126,6 +18626,10 @@ sha256=86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2
 md5=37a185a3cb5c1a39ade7fdc3e6c75349
 sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150
 
+[http://ftp.gnome.org/pub/GNOME/sources/pango/1.24/pango-1.24.2.tar.bz2]
+md5=7bc6c884d847cabc613e4c6d663771f5
+sha256=f3617f8f32c45c57f19c0aa1d7334e1dc979b9b54e5bb4e78fba8ec80193c23c
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
 md5=39868e0da250fd4c00b2970e4eb84389
 sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
@@ -18450,6 +18954,10 @@ sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b
 md5=3aa902cb7a57a4aa09427de603ebf17b
 sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
 
+[http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-0.9.8.tar.gz]
+md5=ec37148c658fa5110bc991ab17ea82f0
+sha256=e0ac5d5a0e936d564785270c6dab756d156c7d24d06a9ab71e1c87362b221447
+
 [http://dev.gentoo.org/~solar/pax/pax-utils-0.1.13.tar.bz2]
 md5=5f09df47a16e83462384b44b75310539
 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
@@ -18734,6 +19242,10 @@ sha256=2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce
 md5=837df4a02c61a60a880644393b57faed
 sha256=45d491879791140dc1f20287e6489f32dc59ae37628038d991d9511abede3fc2
 
+[http://cairographics.org/releases/pixman-0.15.6.tar.gz]
+md5=fe922698df46b21d7e19f28ded4ca100
+sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2]
 md5=c354ab5b0da10227226d3ef604254875
 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa
@@ -19262,6 +19774,10 @@ sha256=6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f
 md5=2e81938855cf5cc38856bd4a31d79a4c
 sha256=a13c81897c94b3d6e705fc9da07c610492e28cf7abd5ff8e992f0ec95a269d62
 
+[http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/linux-i686/xpi/pt-BR.xpi]
+md5=29c672886aa9ca41428ba04196938545
+sha256=1474828a58f893bed20f0e0cd26bc310c7472d69bf7a1ae01c00a371de256b1a
+
 [ftp://ftp.ossp.org/pkg/lib/pth/pth-2.0.0.tar.gz]
 md5=f84a87295fef3b41499f3b728b1f0050
 sha256=1935a06368c1555d5f80329ba1e53f5b1a7dd9efb7fc9354427f2d1a583c81a3
@@ -19290,6 +19806,10 @@ sha256=c99897464bd07c73dbb72095a9806ddc0c26141230e34b181d7e742e78259e4b
 md5=122ab96fcc44110ce05153f259b3285a
 sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305
 
+[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.2.tar.bz2]
+md5=d478121cfc82da7c0f0ce0e53fc7c2fd
+sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd
+
 [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz]
 md5=8108c2474bef16d126e956dce3c5073b
 sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5
@@ -19306,6 +19826,10 @@ sha256=6cc4aff778275f087cfbd65d2040b1587cafc588749499a452eb496329505ab0
 md5=0ed1115222d1d8c64cc14961cccb2eb0
 sha256=e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5
 
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.15.tar.gz]
+md5=4510364eeab219fd100bd1b373b1a002
+sha256=1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
+
 [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
 md5=99b5d9efd4fce35cabb4ae5d0ebb230d
 sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
@@ -19426,6 +19950,10 @@ sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
 md5=935aebcbe610fbc9de8125e7b7d71297
 sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
 
+[http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz]
+md5=0fa33ba1b32b254abe0b731a52c0f2f9
+sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
+
 [http://www.openh323.org/bin/pwlib_1.5.2.tar.gz]
 md5=0fa33ba1b32b254abe0b731a52c0f2f9
 sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
@@ -19610,6 +20138,10 @@ sha256=a6d7db68c87699e283a1f58b637a7e730c350899fd7b35b88e63caa0e85a9ab9
 md5=4d5674f3898a573691ffb335e8d749cd
 sha256=b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea
 
+[http://cyberelk.net/tim/data/pycups/pycups-1.9.45.tar.bz2]
+md5=ff634a6751f8a859ed26751bf03abef0
+sha256=ef6e576e5465da9c338ac8ff9f162825cfb7997359efc52e6a110c295a9f363b
+
 [http://pycurl.sourceforge.net/download/pycurl-7.14.0.tar.gz]
 md5=6f73d518fb520af14634a06ee1b7ddce
 sha256=a60e08b01fc3355ec18ec0e447349b6f8bff3f9628eb42891cff1eb51b9618b1
@@ -20346,6 +20878,10 @@ sha256=9e1db25eec33ba1dff95010d6b8f1150ea40e7f953f1b6b7668a69a1171d23df
 md5=e2e45564f8ce22e00e1360e79c8ccdeb
 sha256=102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
 
+[http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.0.tar.bz2]
+md5=a49416013fff33c853efb32f1926551e
+sha256=cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/randrproto-X11R7.0-1.1.2.tar.bz2]
 md5=bcf36d524f6f50aa16ee8e183350f7b8
 sha256=7a5eb58f10d02f58c2f7fb153bb5dc6d72173d5fa3d317bdbd9674f4577e0ad0
@@ -20438,6 +20974,10 @@ sha256=080aecbaaa5ad81750541ed19fb5ea6ccb45e1c2a5a93e9a2878a42532e40ba5
 md5=84c0a051ba5358546a9c0e393095ab91
 sha256=7cf45008810ca894b085ae0eb1a0071f0cb6989dd9ce35cfcd617fedf7018c7f
 
+[http://download.librdf.org/source/redland-1.0.8.tar.gz]
+md5=ca66e26082cab8bb817185a116db809b
+sha256=8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe
+
 [http://downloads.sourceforge.net/refdbg/refdbg-1.2.tar.gz]
 md5=ed807a83455b8aaff5e894e94161a352
 sha256=0b8591a646d214f0f959483dfcd9b9624996790d546982d814b47ca8fe4c5725
@@ -20574,6 +21114,10 @@ sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1
 md5=613eed8201d37be201805e5048ebb0c3
 sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d
 
+[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.12/rhythmbox-0.12.1.tar.bz2]
+md5=f17a72465dc43d554b11cf7b18776bff
+sha256=1f444b9cd74615831dab7ec8cd3c58c95d7436372df9a768bd701ab4321a8721
+
 [http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz]
 md5=5ac4e1b5ff4f2fdada81c007ac599cb9
 sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de
@@ -20754,7 +21298,7 @@ sha256=554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
 md5=dc0f37d933b0b6c713ad617e09441f3b
 sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
 
-[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz]
+[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5.tar.gz]
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 
@@ -20962,6 +21506,10 @@ sha256=2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
 md5=953dc98dbd78fba3a80d554514581d26
 sha256=0431955a17cd687a28c9b005a6afbc11d8db9348cd4ec91c5600f4f662819e07
 
+[http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2]
+md5=18b370f6ff89546df66fe64a2efd676a
+sha256=d76d0e8267e781e4ed4a93c9f51b7ae1257bfb2fadb8d8f5b64414b5340b1239
+
 [http://savannah.nongnu.org/download/scew/scew-0.3.1.tar.gz]
 md5=e9a69f7014cad332cc78667b07eebbce
 sha256=0e966359b9e1de31bf375b2a982b7f63cc6dd0c253bda480d1913c668791972a
@@ -21934,6 +22482,10 @@ sha256=ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288
 md5=ef40944118841803391d212cb64d3c5b
 sha256=ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288
 
+[http://downloads.sourceforge.net/strace/strace-4.5.18.tar.bz2]
+md5=e9449fcee97e6a8ed73934c883c870e0
+sha256=95e7b7470e04f22c3ec8dc6d0b1fdd8944306cb5313c84c4545cd83abada26d0
+
 [http://downloads.sourceforge.net/streamripper/streamripper-1.61.10.tar.gz]
 md5=2d62a4546521980e1ed705a5094a6ec3
 sha256=08ca63620c1c071f4b2d42c5f63f38cee920aa57cde151ac3cfcf344437e3f11
@@ -22118,6 +22670,10 @@ sha256=c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805
 md5=650c774917be49c526a4f8a3e733c898
 sha256=e7cbddc8c68b1eccba1c82edd5427595397d9a483c8fb1184abc9303afe08045
 
+[http://downloads.sourceforge.net/swig/swig-1.3.39.tar.gz]
+md5=ac201d1b87f8659584534f9540d7ad24
+sha256=bb2d5d9373cf1fe03faaadb02de47af3b058b0300e0f58ece6a7212f0a2b11dc
+
 [http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.10.tar.gz]
 md5=4c920f2a3ee72040df8a8e105ad840df
 sha256=5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
@@ -22254,14 +22810,26 @@ sha256=c087b112da0afd1c50ba8a8a2727c4cabfb1e5a57f43701c5abdc05865072649
 md5=ee6b84cc7b598b4e1a00a4a8c6676d4e
 sha256=d4d17102e014d3183a11719896061dc464c3d9a836caaf47b3b57da4ac23b52d
 
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.11.tar.gz]
+md5=8f9ca6140f428dc9adec9fa1c270a2dd
+sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
+
 [http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.11.tar.gz]
 md5=8f9ca6140f428dc9adec9fa1c270a2dd
 sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
 
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.8.tar.gz]
+md5=ffbad7e8e6dcbe385820b8ffba23b622
+sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
+
 [http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz]
 md5=ffbad7e8e6dcbe385820b8ffba23b622
 sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
 
+[http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-2.0.5.tar.gz]
+md5=c161eefc450fabc246c1a10997c6c6a5
+sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
+
 [http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/syslog-ng-2.0.5.tar.gz]
 md5=c161eefc450fabc246c1a10997c6c6a5
 sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
@@ -22274,6 +22842,10 @@ sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0
 md5=d7b8f27b83ff080ff824177d65a7dae0
 sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649
 
+[http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2]
+md5=a77bde5adc5ee8822b0764ff786ccc09
+sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224
+
 [ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz]
 md5=7d5d61c026122ab791ac04c8a84db967
 sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
@@ -22314,6 +22886,10 @@ sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722
 md5=32d5258f448b5982af9cfa4364f31d41
 sha256=17e64f2f5d7d8a358136a7003604cb60acaef47b083123956b12eb0ed9293055
 
+[http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz]
+md5=0795895d2f20eddcbd2bffe94ed431a6
+sha256=6e98d8032d57d818acc907ec47e6a718851ff251ae7c29aafb868743eb65c88e
+
 [http://tango-project.org/releases/tango-icon-theme-extras-0.1.0.tar.gz]
 md5=caaceaec7b61f1cbda0db9842f9db281
 sha256=b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
@@ -22322,6 +22898,10 @@ sha256=b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
 md5=4e6e4c1a5c1ee2e6026454083de3d5d5
 sha256=d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc
 
+[http://www.tangogps.org/downloads/tangogps-0.9.6.tar.gz]
+md5=85755b15099f6071776d6feb67bdbca8
+sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13
+
 [http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
 md5=e88c400394c092c2688bb2d490c80ccb
 sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
@@ -22602,6 +23182,10 @@ sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013
 md5=17f91175a32827e9c9f45dc7a20a0c2b
 sha256=6ae8157bbec2b36957bbee6895b4cd3f82406fa90fa7d597235c58ea19307be7
 
+[http://kernel.org/pub/software/network/tftp/tftp-hpa-5.0.tar.bz2]
+md5=28beef704a4ef62bc2dead005198ef4c
+sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
+
 [http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz]
 md5=190f08ce6839aecb0fa0ce8d5ddd09ee
 sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473
@@ -22618,6 +23202,10 @@ sha256=11b067df2ce38baa36566bd29ab14bbf2f7c0fcc15e01a5be2a6a85000c39104
 md5=e6388feb0ffcd189af779f165c124b4d
 sha256=6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
 
+[http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin]
+md5=5bfeaacb628b56005a8865a177af01e4
+sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a
+
 [http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz]
 md5=5a085296b1147fe970a256a9b2d0f91f
 sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
@@ -22818,6 +23406,10 @@ sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75
 md5=fa658ae2f20458d3c5d3effba3b2dd7e
 sha256=3193c3446d211db2bd3c169c86f6d433666669336bd589a20c87f1483295cf2a
 
+[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.26/totem-pl-parser-2.26.2.tar.bz2]
+md5=daffda80cfead2a1473ca3ff71e1057b
+sha256=3a6dd0382fe074f23a747b08423fccb23fb38c25b1feddacbd4875d8b8c83743
+
 [http://www.gnome.org/~jamiemcc/tracker/tracker-0.5.4.tar.gz]
 md5=724208e1b2d235148499672b44181298
 sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
@@ -22846,6 +23438,10 @@ sha256=404df2c479517020290be9847191523c1fcbd3e929e8bb1191a7832209d04af8
 md5=490d13c141ba7b4a96582541ea83a461
 sha256=944ab9cfcfc9a4bd7efeecf32ea609fa6517970a9708c44eee6d5750c4ff8e0c
 
+[http://mirrors.m0k.org/transmission/files/transmission-1.61.tar.bz2]
+md5=0b0428f4a6237a64dc8b7d378ace3f06
+sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
+
 [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
 md5=3b713239e5e6b269b31cb665563358df
 sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -23034,6 +23630,10 @@ sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca
 md5=f10b6954498bab5d08d0f50de381af50
 sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca
 
+[http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2]
+md5=4508e9abd423a672763441d8535331c4
+sha256=b18d9f4e1fa5cf1f3d89640d6aa5067da150cebb822fdeb07222991f71684590
+
 [ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2]
 md5=096cac66046326659b97eeded007ec73
 sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7
@@ -23082,6 +23682,10 @@ sha256=0c0afa2816482e087987f71958b656ff0c122032f5e3897a8d17daca5bc14115
 md5=285e2184d2efef50e0fe43b71d2a7b11
 sha256=a2889bee9c45575b284564dbc27cf3dc6cb9833d4ff643976a1b3dba2d763f86
 
+[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.06.tar.bz2]
+md5=dfbe65c1e31bb7de5f5b03d50de192b5
+sha256=b0037cf21b67779ef5a0c585b32e46bde3b78df889484c78bb4318c9b448f560
+
 [http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz]
 md5=49c07dec9e1be69fd01d46f47ec03731
 sha256=a090786113b02647413ebc15888af269f2e6d50f73cbb94b0619cc1702911dae
@@ -23194,6 +23798,10 @@ sha256=001be4a8963c48e7debc82c6078562d087a2979da63e558a5e3613c03725c377
 md5=2d7e548820d2ded5e183933cb701defb
 sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443
 
+[http://projects.unbit.it/downloads/udlfb-0.2.3_and_xf86-video-displaylink-0.3.tar.gz]
+md5=c2aedc8130c2e4d52e334b6804ab70da
+sha256=487a1d7bf4b896d9a4b9e7dd1bd293adcadde5684fe9fe32aa209761c3191b3e
+
 [http://downloads.sourceforge.net/ufraw/ufraw-0.12.tar.gz]
 md5=b2c104938c1c3eb47e7605432bbd3157
 sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
@@ -23390,6 +23998,10 @@ sha256=00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423
 md5=88978b4ad891f610620b1b8e5e0f43eb
 sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4
 
+[http://downloads.sourceforge.net/linux-usb/usbutils-0.82.tar.gz]
+md5=6e393cc7423b5d228fa3d34c21481ae4
+sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f
+
 [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz]
 md5=2ac1bdae03a858b965e895b211a75ad7
 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd
@@ -23454,6 +24066,10 @@ sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d
 md5=23f227da49df36f33fe47e917e332cd8
 sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
 
+[http://kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2]
+md5=71919b69eeecbba05612224d8f2c450f
+sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd
+
 [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2]
 md5=51952682d8b42aeda3af5cee0133ce2c
 sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
@@ -23466,6 +24082,10 @@ sha256=4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4
 md5=ea2d9cd33ca6fd05923f007bd74d7c37
 sha256=97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.2.1.tar.gz]
+md5=81b9746d6202ccf0b4a498cfd0731e71
+sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -23874,6 +24494,10 @@ sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 md5=9e92234b29f062b3779750ba3cd0a71b
 sha256=87caf592bd81922908e7ee6ff356c7d46cf5a2cbe46847df7d64aff537ca16b6
 
+[ftp://ftp.gnu.org/gnu/wget/wget-1.11.4.tar.gz]
+md5=69e8a7296c0e12c53bd9ffd786462e87
+sha256=7315963b6eefb7530b4a4f63a5d5ccdab30078784cf41ccb5297873f9adea2f3
+
 [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
 md5=e6051f1e1487ec0ebfdbda72bedc70ad
 sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
@@ -24178,6 +24802,10 @@ sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 md5=0683a56108ca6d0c4329c7b9a5b7fbde
 sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 
+[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.7.tar.gz]
+md5=30a167577f657909b3355421e14e2ddb
+sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
+
 [http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2]
 md5=25fcaa86a53333d416d5e837fb47ba7d
 sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
@@ -24406,10 +25034,18 @@ sha256=74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
 md5=ceaccde801650ffbffc1e5b0657960d2
 sha256=4511dc4df6ebb320a4a516b3b712c86f6924e5ee9832618f58ebba06c64712ea
 
+[http://install.source.dir.com/xdctools_setuplinux_3_10_03.bin]
+md5=8f0f8af016b97fb612ec11afaaf5a9e7
+sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb
+
 [http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2]
 md5=b3884eaec59a63691f66bc29ce57a56d
 sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22
 
+[http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.10.tar.gz]
+md5=6873f49ea7f568743621ed1e05e52dab
+sha256=169978c677db5c498f485e9896cd0ababae6b3a9d0bf640ffa719d5af2abca46
+
 [http://xdiskusage.sourceforge.net/xdiskusage-1.48.tgz]
 md5=a902aa9d73761ade98256c3cd5c1f533
 sha256=7842aa42510bf52c367164d44a977915ad9f070864d5175157738f8d6894274b
@@ -24518,6 +25154,10 @@ sha256=53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
 md5=3a2e0252e853ab30b3bff05ac92ec61c
 sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
 
+[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.5.tar.bz2]
+md5=e6841018a7c64983b0954aa2c564d115
+sha256=d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2]
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
@@ -24718,6 +25358,10 @@ sha256=825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca
 md5=a6070ead29b2d81b5b386a96df2661b8
 sha256=45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.2.tar.bz2]
+md5=23341f098e7fe8ec13ef06ef784ac51a
+sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
@@ -24726,6 +25370,10 @@ sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
 md5=6eba3b46ff77b99c44f93d2a08cc6935
 sha256=e1e2b2ffe37e1c70829eef55f700cf3cffd49b3b3e0e2d3bb47c2cdd5db5adf6
 
+[http://www.conan.de/touchscreen/xf86-input-evtouch-0.8.8.tar.bz2]
+md5=4d8e092356d8353002f60a4907046c13
+sha256=eafc4a09729a4b2b6120430c71e1954c5cac299ad6adf2f9a40aee8a7b51e476
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.1.0.tar.bz2]
 md5=a31066a2076d18619ceaea67f6d89698
 sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8
@@ -24810,6 +25458,10 @@ sha256=c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072
 md5=ebe5dcf8eed819103909f18321fc3b9d
 sha256=7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.3.2.tar.bz2]
+md5=d6fe929c4f6085d6dd67f197ae9c42f6
+sha256=33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2]
 md5=8fb8a30fd9d7f152a1aef4eb8ef32b3f
 sha256=e82d510157d13be37eed604cfb0d9355c054c4d3ac39bdef0c6ef320f2973d77
@@ -24890,6 +25542,10 @@ sha256=a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab
 md5=31a51b0e5ddc4fac19754f48a3adf881
 sha256=054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.4.0.tar.bz2]
+md5=e7dc0759c14a9bfd373917a49e5f7c7d
+sha256=e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2]
 md5=12a908e5a97b1b03e8717abf167f4f27
 sha256=183c1cda6550c8821ef4b8d13e681a32813bcd32b6cf34a75d3870e399fa292d
@@ -25162,6 +25818,14 @@ sha256=6eb51d5d4489083c8a1eeabc1fbd22baeafe6486a7940516d1e2b741564acd06
 md5=adb1e6346efd8dfe5dcccd47d46869cb
 sha256=25ba42dedc297ca2a7257fdb4e050e8d61cdd6710c8adabdb3925908b09f9d02
 
+[http://projects.unbit.it/downloads/xf86-video-displaylink-0.1.tar.gz]
+md5=4faccf8ec4e5830ad87285317162c041
+sha256=6a1bb0297a24ad8da0466088d23cf10340f2a729f2a985712f4620a9a2dde675
+
+[http://projects.unbit.it/downloads/xf86-video-displaylink_and_udlfb.tar.gz]
+md5=9a10f8884e711cb0239a60aec721a594
+sha256=aa8c9dc0a156f25adcaec1a8749665996036251bc31d7a2501dbf895211f0951
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.2.0.tar.bz2]
 md5=22b7cc20a33443cbd218bd2521850cfe
 sha256=46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910
@@ -25198,6 +25862,10 @@ sha256=d03eb7e5b47e2f1e1a665700f4e22d15651dc949196b0ec880f0d63cafb6814c
 md5=1dbede8f6393edfe6c1ecab2f754b3b2
 sha256=d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.2.tar.bz2]
+md5=4c652ecba772f705296b8e52d746857c
+sha256=2d252847a410636b55bf80900d9432ca438775f70377ce81311282a2d12853b5
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.8.0.tar.bz2]
 md5=a2b9c70a32b0a6436d837d67fa7aae18
 sha256=f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f
@@ -25538,6 +26206,10 @@ sha256=1596b79ab3e33263bde2d456cc0376808abee80b4cde059605f176d98bdb45cb
 md5=7b1f5465f423a859f306f4f1d6306a1b
 sha256=76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.1.tar.bz2]
+md5=42069e70578bf3fb353cdacad186f6c0
+sha256=b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2]
 md5=781d726a0ca54b65521e383ab99043c8
 sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3
@@ -26170,10 +26842,18 @@ sha256=5e3db5f2387457f67798d664ed67c67337d2f84c45f15d986ee2f46f9b45d0d1
 md5=d12efb18c7e3025c5e6a6f63144c2145
 sha256=b968a10f52b0c5e807ec4c2c106f3aea301cf0ac00d04299b6961370c82c66d8
 
+[http://downloads.sourceforge.net/xine/xine-lib-1.1.0.tar.gz]
+md5=3537cfd58d253b4be20a4975e7086e38
+sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
+
 [http://downloads.sourceforge.net/xine/xine-lib-1.1.16.tar.bz2]
 md5=acd1a210c5a6444e8fd44696469352bb
 sha256=27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be
 
+[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.3.tar.bz2]
+md5=4f508abf088cf427a731f85634c8260d
+sha256=d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52
+
 [http://folks.o-hand.com/dodji/0xdeadbabe/xine.tgz]
 md5=8b78ce490cde6eb3c586656e9bc5ead8
 sha256=86402c93b332c44b4e79c568137257d567de1f95cd5f6f6e5433b7e67b40050a
@@ -26566,6 +27246,10 @@ sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
 md5=308971036e25250e7fe3cccfd5a120f8
 sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.1.tar.bz2]
+md5=ed0878bf32a24d4948c3b8a122a39eff
+sha256=0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -26702,6 +27386,10 @@ sha256=bec5a98bbea56da069785784116261ec956df039fb07d0cdca53ae1ed03ebc0f
 md5=7d26f45dca52632712a696e0631dc17b
 sha256=6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592
 
+[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.15.tar.bz2]
+md5=1a2b31430d04340be2e49e8b6445e076
+sha256=fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
+
 [http://xorg.freedesktop.org/releases/development/X11R7.2-RC3/proto/xproto-7.0.9.tar.gz]
 md5=937c572775ff4a2edfbbf5568dc0e959
 sha256=e68db1c55c1c6d398098d69096b3c3b35863b5d25ef216cb2d1d4364ab0000af
@@ -26842,6 +27530,10 @@ sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62
 md5=6d7aaa9c267427ddb78faf008cf78187
 sha256=8109646b77c08a0f269531ad42475782101a88681c2590453f4a5c9fe4681932
 
+[http://gpe.linuxtogo.org/download/source/xserver-common-1.25.tar.gz]
+md5=95faf3cc8c0a70352e9580fc873ca693
+sha256=f0391d08a6763598066e21d83460493973fe24fc65e3f0d2b534ef2497946a34
+
 [http://gpe.linuxtogo.org/download/source/xserver-common-1.3.tar.gz]
 md5=b55e9347b9aed725cc7baf91701cdd83
 sha256=177b5a3e65d7a64b5a0fbbf1b10f8e3d020a20c823b1bb9f3269dc835df213e1
@@ -26966,6 +27658,10 @@ sha256=16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d
 md5=96e142331edd498a9364887b2548f1bb
 sha256=9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd
 
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.3.tar.bz2]
+md5=f9cf791dfad59cf044e276aab3a71e1d
+sha256=a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
+
 [http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.tar.bz2]
 md5=a91fef8b932b21992af7dfff7b2643f3
 sha256=d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4
@@ -27142,6 +27838,10 @@ sha256=f849da3eec59b22599a806d59e81729ba9234fc2318335804d45d9dce23fb532
 md5=2caa84539d463743bbcbfb41b9ac6861
 sha256=e145638ab4b0f267075b82db5ab9f7170ae2abf1fa1212d5175c31fe4bd28477
 
+[http://downloads.sourceforge.net/zbar/zbar-0.8.tar.bz2]
+md5=b5b0efd92af16230ce9952e7a9a671fd
+sha256=5415ffde882c7f7acee58e8a36aa65e732cfcfbbb582669480d6cf9549edfbbc
+
 [http://downloads.sourceforge.net/bedic/zbedic_1.0-0.tgz]
 md5=96eb282a1a3e4fea69b94f1db069f4e9
 sha256=f218b25c4be2261c49b9c9e1f10c93b64eaf6132ace6bc4052cf0489e3ac56e8
@@ -27198,6 +27898,14 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
 md5=791e8986c6e16dcd1c9878126725e06b
 sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119
 
+[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
+md5=b9989582ea43f8fd58819d85ef9c9bc5
+sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
+
+[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.26/zenity-2.26.0.tar.bz2]
+md5=6660ce6dac0a6ca495a0e954cb6b40a2
+sha256=fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1
+
 [http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.6.1.tar.gz]
 md5=31ac40fdaf24b3e666ed83c1320dd7a5
 sha256=3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index bb50220f29..f0b8a040ea 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -18,7 +18,9 @@
 #DISTRO_VERSION = "2009.X"
 DISTRO_VERSION = "2009.X-test-${DATE}"
 DISTRO_REVISION = "2"
-DISTRO_PR = ".2"
+DISTRO_PR = ".3"
+
+OLDEST_KERNEL ?= "2.6.16"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -71,8 +73,8 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc 		?= "2.6.1"
-PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
+PREFERRED_VERSION_glibc 		?= "2.9"
+PREFERRED_VERSION_glibc-initial 	?= "2.9"
 PREFERRED_VERSION_uclibc        	?= "0.9.30"
 PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
 
@@ -87,10 +89,6 @@ PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-angstrom"
 
 PREFERRED_PROVIDER_avahi = "avahi"
 
-#Small machines prefer kdrive, but we might ship full Xorg in other images
-PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
-PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
-
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
@@ -121,11 +119,6 @@ PREFERRED_VERSION_gcc-cross-sdk          ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-initial      ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
-#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
@@ -147,7 +140,6 @@ PREFERRED_PROVIDER_virtual/db           ?= "db"
 PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
-PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
@@ -196,6 +188,11 @@ require conf/distro/include/angstrom${ARM_ABI}.inc
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
 IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
+# 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
 
 # Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index a11c1d5691..28de7667d5 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,3 +1,5 @@
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
 PREFERRED_VERSION_automake-native = "1.10.2"
 PREFERRED_VERSION_busybox 	= "1.13.2"
 PREFERRED_VERSION_cairo		= "1.8.0"
@@ -11,6 +13,7 @@ PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_gtk+		= "2.16.0"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
+PREFERRED_VERSION_hal		= "0.5.12"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
 PREFERRED_VERSION_libsdl-x11	= "1.2.11"
@@ -18,12 +21,40 @@ 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_pango 	= "1.22.0"
+PREFERRED_VERSION_libx11 = "1.2"
+PREFERRED_VERSION_mesa = "7.2"
+PREFERRED_VERSION_pango 	= "1.24.2"
 PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
-PREFERRED_VERSION_pulseaudio 	= "0.9.10"
+PREFERRED_VERSION_pulseaudio 	= "0.9.15"
+PREFERRED_VERSION_samba		= "3.3.0"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
-PREFERRED_VERSION_udev 		= "124"
+
+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_wpa-supplicant = "0.6.7"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.6.1"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
+
+
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 655cf9d50e..92e22332b7 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -10,11 +10,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-BUILD_OPTIMIZATION = "-Os"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_sparc = "-O2"
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 5df77d8c74..1f0967a42e 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -10,16 +10,18 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3"
 
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
 
-BUILD_OPTIMIZATION = "-O2"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_pn-glibc = "-O2"
 BUILD_OPTIMIZATION_sparc = "-O2"
+BUILD_OPTIMIZATION_ep9312 = "-O"
 
 TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
 
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 3079e0d365..a60952ff06 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -14,8 +14,8 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-BUILD_OPTIMIZATION = "-Os"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
 
 #Gcc will die with 'internal consistency error when using the above optimizations
 #with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
index c3f908c2c4..019f814b8f 100644
--- a/conf/distro/include/angstrom-uclinux-uclibc.inc
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -10,8 +10,8 @@ TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_AR
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-BUILD_OPTIMIZATION = "-Os"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
 
 #Gcc will die with 'internal consistency error when using the above optimizations
 FULL_OPTIMIZATION_avr32 = ""
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 7e921bf06a..525f949331 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -7,6 +7,8 @@ USERDISTRO := "${DISTRO}"
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
+BUILDNAME = "Angstrom ${DISTRO_VERSION}"
+
 TARGET_VENDOR = "-angstrom"
 
 # Add FEED_ARCH to overrides
@@ -54,7 +56,7 @@ THUMB_INTERWORK = "yes"
 #Use this variable in feeds and other parts that need a URI
 ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
-#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list)
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
 # usefull for derivative distros and local testing
 # As this is runtime we can't and won't use virtual/feed-configs
 ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
@@ -78,6 +80,9 @@ INHERIT += "angstrom-mirrors"
 INHERIT += "insane"
 QA_LOG = "1"
 
+#run QA tests on recipes
+INHERIT += "recipe_sanity"
+
 #save statistical info on images
 INHERIT += "testlab"
 
@@ -99,10 +104,8 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 # We only want to build UTF8 locales
 LOCALE_UTF8_ONLY = "1"
 
-#qemu doesn't like armv6/eabi/vfp
-ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0"
-ENABLE_BINARY_LOCALE_GENERATION_armv6-novfp = "0"
-ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
+#qemu doesn't like this fp
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
@@ -193,7 +196,7 @@ SEPPUKU_AUTOBUILD    = "1"
 SEPPUKU_PRODUCT      = "Openembedded"
 SEPPUKU_COMPONENT    = "org.openembedded.dev"
 
-OESTATS_SERVER      ?= "tinderbox.openembedded.net"
+OESTATS_SERVER      ?= "tinderbox.openembedded.org"
 
 
 
diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc
index 0d2087ed4b..04431403e2 100644
--- a/conf/distro/include/eglibc.inc
+++ b/conf/distro/include/eglibc.inc
@@ -7,3 +7,14 @@ PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
 PREFERRED_PROVIDER_virtual/libc = "eglibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc"
+
+# eglibc is configured for OLDEST_KERNEL kernel version, so we set minimal
+# sane versions there
+
+OLDEST_KERNEL ?= "2.4.0"
+
+# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi"
+# TARGET_OS here, not on architecture which is 'arm' in both cases
+OLDEST_KERNEL_linux-gnueabi ?= "2.6.16"
+OLDEST_KERNEL_sparc64 ?= "2.4.21"
+OLDEST_KERNEL_ppc64 ?= "2.4.21"
diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc
index f9140ffa43..2cb6502322 100644
--- a/conf/distro/include/glibc.inc
+++ b/conf/distro/include/glibc.inc
@@ -7,3 +7,14 @@ PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
+
+# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal
+# sane versions there
+
+OLDEST_KERNEL ?= "2.4.0"
+
+# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi"
+# TARGET_OS here, not on architecture which is 'arm' in both cases
+OLDEST_KERNEL_linux-gnueabi ?= "2.6.14"
+OLDEST_KERNEL_sparc64 ?= "2.4.21"
+OLDEST_KERNEL_ppc64 ?= "2.4.21"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 8c5c4f7cb0..65676ec969 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -503,7 +503,7 @@ PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
 PREFERRED_VERSION_gnome-vfs-extras ?= "0.99.13"
 PREFERRED_VERSION_gnome-vfs-obexftp ?= "0.4"
 PREFERRED_VERSION_gnuchess ?= "5.05"
-PREFERRED_VERSION_gnumeric ?= "1.6.3"
+PREFERRED_VERSION_gnumeric ?= "1.8.4"
 PREFERRED_VERSION_gnupg ?= "1.4.2.2"
 PREFERRED_VERSION_gnuplot ?= "4.2.2"
 PREFERRED_VERSION_gnuradio ?= "3.0.4"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
index 1f6076525f..6e42065aed 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -2,6 +2,6 @@
 
 PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.2"
 PREFERRED_VERSION_libxi ?= "1.2.0"
 PREFERRED_VERSION_inputproto ?= "1.5.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 46fa8d496a..21f9758f0e 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -195,6 +195,7 @@ PREFERRED_VERSION_xtrans ?= "1.2.1"
 # This should be here but is needed until bitbake can do
 # versioned depends
 PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_xtrans-native ?= "1.2.1"
 
 # proto
 PREFERRED_VERSION_applewmproto ?= "1.0.3"
@@ -218,6 +219,7 @@ PREFERRED_VERSION_videoproto ?= "2.2.2"
 PREFERRED_VERSION_windowswmproto ?= "1.0.3"
 PREFERRED_VERSION_xmiscproto ?= "1.1.2"
 PREFERRED_VERSION_xextproto ?= "7.0.3"
+PREFERRED_VERSION_xextproto-native ?= "7.0.3"
 PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
 PREFERRED_VERSION_xf86driproto ?= "2.0.4"
 PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 1be3dabc2b..422145c8c2 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -9,9 +9,9 @@ SRCDATE_prism54-module ?= "20060814"
 SRCDATE_aufs ?= "20081203"
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
-SRCDATE_dvbstream ?= "20060814"
-SRCDATE_dvbtraffic ?= "20060814"
-SRCDATE_dvbtune ?= "20060814"
+SRCDATE_dvbstream ?= "20090621"
+SRCDATE_dvbtraffic ?= "20090621"
+SRCDATE_dvbtune ?= "20090621"
 SRCDATE_fdclock ?= "20060814"
 SRCDATE_fltk ?= "20060814"
 SRCDATE_gnuplot ?= "20080328"
@@ -46,8 +46,8 @@ SRCDATE_waimea ?= "20060814"
 SRCDATE_xcompmgr ?= "20060814"
 SRCDATE_xirssi ?= "20060814"
 SRCDATE_xsvg ?= "20060814"
-SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zaurusd ?= "20060628"
+SRCDATE_yamonenv ?= "20051022"
+SRCDATE_zaurusd ?= "20090501"
 
 # Freedesktop.org
 SRCDATE_poppler0.6 = "20070708"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1f97381738..470bace2b8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -13,12 +13,13 @@
 
 SRCREV_pn-accelges ?= "206"
 SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
+SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
+SRCREV_pn-bubble-keyboard ?= "194"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
@@ -42,7 +43,7 @@ SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-eglibc ?= "8139"
 SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
-SRCREV_pn-essential-dialer ?= "111"
+SRCREV_pn-essential-dialer ?= "194"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -74,22 +75,26 @@ SRCREV_pn-gcc-cross-initial ?= ${GCCREV}
 SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV}
 SRCREV_pn-gcc-cross-sdk ?= ${GCCREV}
 SRCREV_pn-gconf-dbus ?= "641"
+SRCREV_pn-gnet ?= "495"
 SRCREV_pn-gnuradio ?= "10302"
 SRCREV_pn-gpe-conf ?= "9900"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-gallery ?= "9376"
+SRCREV_pn-gpe-mini-browser2 ?= "9900"
 SRCREV_pn-gpe-sketchbook ?= "9547"
+SRCREV_pn-gridpad ?= "194"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
+SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libeflvala ?= "676c901eb57f653231fb4c9eeabc2ed3d1b0c072"
-SRCREV_pn-libefso ?= "111"
+SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
@@ -99,7 +104,7 @@ SRCREV_pn-libgsm0710 ?= "50079c58e6f4a21edd6ab33ef2365abb1f5441d2"
 SRCREV_pn-libgsm0710mux ?= "114044266a094c61a2c25ee5a823635ae50a4e89"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
-SRCREV_pn-libjana ?= "713"
+SRCREV_pn-libjana = "749"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "4568"
@@ -131,7 +136,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338"
+SRCREV_pn-midori ?= "3179a538a947cbd7612cac346e3e0c7c3d0e03cd"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
@@ -219,7 +224,7 @@ SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
 SRCREV_pn-python-pyrtc ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-python-pyyaml ?= "344"
 QEMUSRCREV ?= "4242"
-SRCREV_pn-tslib ?= "53"
+SRCREV_pn-tslib ?= "77"
 SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
@@ -249,7 +254,7 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "43635"
+SRCREV_pn-webkit-gtk ?= "44532"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
@@ -261,7 +266,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "40247"
+EFL_SRCREV ?= "41038"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc
index 1b0d49316d..4c5f44ff8e 100644
--- a/conf/distro/include/sane-toolchain-eglibc.inc
+++ b/conf/distro/include/sane-toolchain-eglibc.inc
@@ -7,7 +7,6 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-BUILD_OPTIMIZATION = "-Os"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_sparc = "-O2"
 
diff --git a/conf/distro/include/sane-toolchain-glibc.inc b/conf/distro/include/sane-toolchain-glibc.inc
index b4da525fcf..f3da7c31a2 100644
--- a/conf/distro/include/sane-toolchain-glibc.inc
+++ b/conf/distro/include/sane-toolchain-glibc.inc
@@ -15,7 +15,6 @@ FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -fre
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-BUILD_OPTIMIZATION = "-O2"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_pn-glibc = "-O2"
 BUILD_OPTIMIZATION_sparc = "-O2"
diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc
index 394b52ae75..68e5031efc 100644
--- a/conf/distro/include/sane-toolchain-uclibc.inc
+++ b/conf/distro/include/sane-toolchain-uclibc.inc
@@ -16,7 +16,6 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-BUILD_OPTIMIZATION = "-Os"
 
 #Gcc will die with 'internal consistency error when using the above optimizations
 #with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 718239bed8..b7add998c7 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,7 @@
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 28-04-2009
+#@VERSION: 23-06-2009 - B
 #
 # Use this at your own risk, we welcome bugreports filed at 
 #    http://bugs.openembedded.net
@@ -12,7 +12,7 @@
 #DISTRO_VERSION = "2009.1"
 DISTRO_VERSION = "2009.1-test-${DATE}"
 DISTRO_REVISION = "1"
-DISTRO_PR = ".1"
+DISTRO_PR = ".2"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -42,6 +42,8 @@ DISTRO_TYPE ?= "debug"
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
 
+# increase inode/block ratio for ext2 filesystem 
+EXTRA_IMAGECMD_ext2 = "-i 4096"
 
 # set feed path variables
 FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
@@ -128,6 +130,9 @@ PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 
+#Other packages version
+PREFERRED_VERSION_classpath ?= "0.97.2"
+
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
@@ -209,12 +214,12 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps"
 # contains ipkg specific stuff as well :(
 DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
-    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     kaeilos-version \
     opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-ng-mount util-linux-ng-umount \
     ${DEBUG_APPS} angstrom-libc-fixup-hack \
     "
+#   ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
 
 # This also hooks into task-base, but isn't mandatory.
 # If you don't want parts of this in your task-base using images you can put this in the image recipe:
@@ -233,5 +238,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     openssh-sftp-server \
     "
 
+SPLASH ?= "psplash"
+
 ARM_INSTRUCTION_SET_pn-uclibc = "arm"
 ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
index 82b78cbf79..f793d4a3c1 100644
--- a/conf/distro/micro-uclibc.conf
+++ b/conf/distro/micro-uclibc.conf
@@ -10,6 +10,9 @@
 # Based on the Micro Linux distribution
 require conf/distro/micro.conf
 
+# Use overrides for micro as well
+OVERRIDES .= ":micro"
+
 #############################################################################
 # DISTRO CONFIGURATION
 #############################################################################
@@ -20,11 +23,12 @@ DISTRO_NAME = "micro-uclibc"
 #############################################################################
 # Use linux uclibc
 TARGET_OS = "linux-uclibc"
+TARGET_OS_armeb = "linux-uclibcgnueabi"
 
 #############################################################################
 # TOOLCHAIN
 #############################################################################
-PREFERRED_LIBC = "uclibc"
+LIBC = "uclibc"
 
 #############################################################################
 # PREFERRED PROVIDERS 
@@ -34,6 +38,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc	= "uclibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils	= "binutils-cross"
 PREFERRED_PROVIDER_linux-libc-headers	= "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libintl	= "proxy-libintl"
+PREFERRED_PROVIDER_virtual/libiconv     = "libiconv"
 
 #############################################################################
 # PREFERRED VERSIONS 
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index bf4e5e1a82..c566d7502d 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -47,11 +47,11 @@ require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
 # IMAGES
 #############################################################################
 # Name generated images
-IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-\
 ${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
 
-CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
-DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
+CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 # Image output types
@@ -66,7 +66,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 #############################################################################
 # TOOLCHAIN
 #############################################################################
-PREFERRED_LIBC = "glibc"
+LIBC = "glibc"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
@@ -98,3 +98,16 @@ USE_NLS_gcc-cross = "no"
 # Disable binary locale generation
 ENABLE_BINARY_LOCALE_GENERATION = "0"
 
+# Don't install useless symlinks to libraries
+PACKAGE_SNAP_LIB_SYMLINKS = "1"
+
+# Collapse /usr into /
+layout_prefix = ""
+layout_exec_prefix = ""
+
+# Don't install ldconfig and associated gubbins
+USE_LDCONFIG = "0"
+
+# Disable online package management
+ONLINE_PACKAGE_MANAGEMENT = "none"
+
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index f1f04e5e6a..8b834d0f4a 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -13,7 +13,7 @@
 DISTRO_NAME ?= "minimal"
 DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
 #DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
+DISTRO_TYPE ?= "debug"
 
 # Ensure some form of release config, so error out if someone thinks he knows better
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
@@ -24,7 +24,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 # Use bluetooth 4.0
 DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
 
 #############################################################################
 # LIBRARY NAMES
@@ -61,6 +61,9 @@ CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
 DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
+# increase inode/block ratio for ext2 filesystem 
+EXTRA_IMAGECMD_ext2 = "-i 8192"
+
 #############################################################################
 # KERNEL
 #############################################################################
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 3670f725de..99cab2bcbb 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -1,40 +1,73 @@
+#############################################################################
 #@TYPE: Distribution
 #@NAME: Nylon Linux
 #@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution
+#############################################################################
 
-# this distribution is mainly for wireless networking devices and includes
-# packages necessary for wireless LAN access point, routing, encryption and 
-# especially mesh routing applications
-#
-# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other 
-# mipsel based platforms
-#
-# Bruno Randolf <bruno.randolf@4g-systems.biz>
+require conf/distro/angstrom-2008.1.conf
 
-TARGET_OS = "linux"
+#############################################################################
+# NAME and VERSION
+#############################################################################
+DISTRO_NAME = "nylon"
+DISTRO = ${DISTRO_NAME}
+DISTRO_VERSION = "${NYLON_VERSION}"
+BUILDNAME := "${NYLON_VERSION}"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
+TARGET_FPU = "soft"
+SRCDATE := "20050527"
+TARGET_VENDOR = "-nylon"
+
+# Ensure some form of release config, so error out if someone thinks he knows better
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
+
+#############################################################################
+# PACKAGING
+#############################################################################
+# Chose the packaging system
+INHERIT += "nylon-mirrors"
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name the generated images in a sane way
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}"
+KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}"
 
-INHERIT += "package_ipk debian nylon-mirrors"
-INHERIT += "linux-kernel-base"
+#############################################################################
+# KERNEL
+#############################################################################
+KERNEL = "kernel24"
+MACHINE_KERNEL_VERSION = "2.4"
 
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/libx11:diet-x11"
-PREFERRED_PROVIDERS += " python:python-curses"
-PREFERRED_PROVIDER_classpath = "classpath-minimal"
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}"
+CXXFLAGS := ${fixedCxxflags}
 
-TARGET_FPU = "soft"
+# we're not supporting pcmcia right now
+DISTRO_FEATURES = "nfs smbfs wifi pcmcia ppp ext2 vfat usbhost pci"
 
-SRCDATE := "20050527"
+# FIXME: cannot build linux-libc-headers unless this is set.
+IPKGBUILDCMD = "stage-manager-ipkg-build -o 0 -g 0"
 
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+PREFERRED_VERSION_busybox = "1.7.2"
 PREFERRED_VERSION_glibc = "2.3.3"
+PREFERRED_VERSION_glibc-initial = "2.3.2"
 PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
 PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
-PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223"
+PREFERRED_VERSION_mtd-utils = "1.0.0+git"
 PREFERRED_VERSION_kismet = "2005-01-R1"
+PREFERRED_VERSION_automake-native = "1.10"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_netperf = "2.3"
+PREFERRED_PROVIDER_hotplug = "linux-hotplug"
 
 PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
 PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4"
@@ -45,67 +78,8 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
 PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
 PREFERRED_VERSION_binutils = "2.16"
 PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-
 PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
-
-KERNEL_VERSION_mtx-1 = "2.4.27"
-KERNEL_VERSION_mtx-2 = "2.4.27"
-
-#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" 
-PREFERRED_VERSION_gcc_mtx-3 = "3.4.4"
-### did not compile with:
-#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7"
-#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7"
-### falling back to:
-PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1"
-PREFERRED_VERSION_binutils_mtx-3 = "2.16"
+#PREFERRED_VERSION_udev = "089"
+PREFERRED_VERSION_udev = "100"
 PREFERRED_VERSION_madwifi-modules = "0.9.3"
 PREFERRED_VERSION_madwifi-tools = "0.9.3"
-
-PREFERRED_VERSION_udev = "089"
-
-KERNEL_VERSION_mtx-3 = "2.6.15.4"
-PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a"
-
-
-#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" 
-PREFERRED_VERSION_gcc_mtx-3a = "3.4.4"
-### did not compile with:
-#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7"
-#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7"
-### falling back to:
-PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1"
-PREFERRED_VERSION_binutils_mtx-3a = "2.16"
-
-PREFERRED_VERSION_udev = "100"
-
-KERNEL_VERSION_mtx-3a = "2.6.16.6"
-
-
-# usually overrrided from local.conf
-NYLON_RELEASE = "unstable"
-
-# use meshcub.org mirrors for CVS sources
-CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/"
-
-export FEED_URIS = " \
-        nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \
-        nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed"
-
-# image names
-DISTRO_VERSION = "${NYLON_VERSION}"
-BUILDNAME := "${NYLON_VERSION}"
-#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}"
-KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}"
-
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 93077e1025..bd3b93ec17 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -25,6 +25,15 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 
+# We are still using 2.4 embedix kernels
+COMPATIBLE_MACHINE_pn-c7x0-kernels = "(c7x0|corgi|husky|shepherd)"
+COMPATIBLE_MACHINE_pn-collie-kernels = "collie"
+COMPATIBLE_MACHINE_pn-poodle-kernels = "(poodle|poodle255)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz|borzoi)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|corgi|husky|shepherd|poodle|poodle255|tosa)"
+COMPATIBLE_MACHINE_pn-openzaurus-sa = "collie"
+
+
 #
 # Base
 #
diff --git a/conf/licenses.conf b/conf/licenses.conf
index 01c4747167..3da47f9d00 100644
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -1,6 +1,5 @@
 SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 GPLv3 LGPL LGPLv2.1 LGPLv3"
-SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL"
+SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL CUPS"
 SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
 SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl"
-SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers"
-
+SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers Stanford"
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 9930c89c6a..6f71787fa1 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,3 +21,7 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
+
+# xserver-kdrive 1.3.0.0 is still the only working version:
+XSERVER = "xserver-kdrive-1300-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/at2440evb.conf b/conf/machine/at2440evb.conf
new file mode 100644
index 0000000000..f3fa5edfaf
--- /dev/null
+++ b/conf/machine/at2440evb.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Avantech AT2440EVB Dev Board
+#@DESCRIPTION: Machine configuration for Avantech AT2440EVB Dev Board
+
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_FSTYPES = "tar.gz"
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
+
+MACHINE_FEATURES = "kernel26 screen touchscreen"
+
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf
index 50549dabf6..87311e9be4 100644
--- a/conf/machine/at91cap9adk.conf
+++ b/conf/machine/at91cap9adk.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91cap9adk_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 3882c118fb..9a7ca9af62 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9260ek_config"
+UBOOT_MACHINE = "at91sam9260ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index a3a9be6dc1..79f275f483 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9261ek_config"
+UBOOT_MACHINE = "at91sam9261ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index e633148172..f052170aed 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91sam9263ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 903e953b13..7dc6ba0d53 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91sam9g20ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
@@ -18,8 +17,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10"
 USE_VT = "0"
 
 MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
-#EXTRA_IMAGEDEPENDS += "u-boot"
-#EXTRA_IMAGEDEPENDS += "at91bootstrap"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
index ba19cb3e00..f7a78dcf75 100644
--- a/conf/machine/at91sam9rlek.conf
+++ b/conf/machine/at91sam9rlek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9rlek_config"
+UBOOT_MACHINE = "at91sam9rlek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index 3c21c546b1..956e3f47b5 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -4,7 +4,6 @@
 TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 PACKAGE_EXTRA_ARCHS = " iwmmxt"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 96f430f377..47f6e30dfd 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -2,35 +2,17 @@
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
-TARGET_ARCH = "arm"
+require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-strongarm.inc
 
-MACHINE_KERNEL_VERSION = "2.6"
-KERNEL_IMAGE_MAXSIZE = "1048576"
-KERNEL_IMAGETYPE = "zImage"
-SERIAL_CONSOLE = "115200 ttySA0"
-
 ROOT_FLASH_SIZE = "14"
-# actually 14680064, see EXTRA_IMAGECMD
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-XSERVER ?= "xserver-kdrive-fbdev"
-
+# actually 14680064
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
-IMAGE_LINGUAS ?= ""
-IMAGE_FSTYPES ?= "jffs2 tar.gz"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+XSERVER = "xserver-kdrive-fbdev"
 
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "270"
 MACHINE_DISPLAY_PPI = "114"
-
-require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
deleted file mode 100644
index f52efc2aab..0000000000
--- a/conf/machine/davinci-dvevm.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: DM6446 cpu on a Davinci EVM board
-#@DESCRIPTION: Machine configuration for the TI Davinci EVM board
-
-TARGET_ARCH = "arm"
-
-HOTPLUG = "udev"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
-#PREFERRED_VERSION_u-boot = "1.3.2"
-UBOOT_MACHINE = "davinci_dvevm_config"
-UBOOT_ENTRYPOINT="0x80008000"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-
-#ROOT_FLASH_SIZE = "29"
-
-MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
-
-require conf/machine/include/tune-arm926ejs.inc
-
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
new file mode 100644
index 0000000000..9ef4ff7c7d
--- /dev/null
+++ b/conf/machine/dm355-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM355 CPUs on a Davinci DM355 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM355 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dm355_evm_config"
diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf
index 5131488577..a488e0b1c8 100644
--- a/conf/machine/dm355-leopard.conf
+++ b/conf/machine/dm355-leopard.conf
@@ -2,18 +2,14 @@
 #@NAME: Leopard "beagle buddy" DM355 based IP cam board
 #@DESCRIPTION: Machine configuration for the DM355 leopard board
 
+require conf/machine/include/davinci.inc
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
 PREFERRED_VERSION_u-boot = "1.2.0"
-UBOOT_MACHINE = "dm355_leopard_config"
+UBOOT_MACHINE = "davinci_leopard_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 
 MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc"
 
-require conf/machine/include/tune-arm926ejs.inc
-
diff --git a/conf/machine/dm357-evm.conf b/conf/machine/dm357-evm.conf
new file mode 100644
index 0000000000..85e396ec1a
--- /dev/null
+++ b/conf/machine/dm357-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM357 CPUs on a Davinci DM357 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM357 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
new file mode 100644
index 0000000000..de2cc4a759
--- /dev/null
+++ b/conf/machine/dm365-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM365 CPUs on a Davinci DM365 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf
new file mode 100644
index 0000000000..8b048a5474
--- /dev/null
+++ b/conf/machine/dm6446-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM644x CPUs on a Davinci DM6446 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf
new file mode 100644
index 0000000000..a7596f17f8
--- /dev/null
+++ b/conf/machine/dm6467-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM646x CPUs on a Davinci HD DM6467 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci HD DM6467 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dm6467_evm_config"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 268ed52b61..6b91d1b951 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen maverick"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "57600 ttyAM0"
@@ -21,9 +21,11 @@ ROOT_FLASH_SIZE = "8"
 #extra jffs2 tweaks
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
-#tune for ep93xx cpus
-#can be used for crunch support later on
+# tune for ep93xx cpus can be used for crunch support but it is not
+# recommended to build whole rootfs with it (it boots anyway)
+# better would be building separate applications/libraries which makes
+# use of floating point operations
+#
 #require conf/machine/include/tune-ep9312.inc
 
-
 require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index 6fe6a830e6..0ec6782076 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH =  "i486"
 
-require conf/machine/include/tune-geodegx.inc
+require conf/machine/include/tune-geode.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
@@ -14,4 +14,4 @@ udevdir = "/dev"
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index de4d9ca16e..f8874fd966 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -1,14 +1,15 @@
-TARGET_ARCH = "i486"
+# Machine file for devices with the AMD Geode LX processor 
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 
-require conf/machine/include/tune-geodelx.inc
+TARGET_ARCH =  "i486"
 
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+require conf/machine/include/tune-geode.inc
 
-PREFERRED_PROVIDER_virtual/kernel="linux-geodelx"
-
-SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx"
 
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
new file mode 100644
index 0000000000..af9dc0ff9c
--- /dev/null
+++ b/conf/machine/include/davinci.inc
@@ -0,0 +1,25 @@
+require conf/machine/include/tune-arm926ejs.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r8"
+
+TARGET_ARCH = "arm"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+UBOOT_MACHINE = "davinci_dvevm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+#EXTRA_IMAGEDEPENDS += "u-boot ubl"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+#ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
index 1835af4727..6ee1ddc3fa 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/initramfs-kexecboot.inc
@@ -1,16 +1,13 @@
-# kexecboot specific config options
-
-# NOTE: include this file after zaurus-2.6.inc for zaurus machines
+# initramfs-kexecboot specific config options
 
 MACHINE_FEATURES_append = " kexecboot "
 
-IMAGE_FSTYPES += " tar.gz "
 EXTRA_IMAGEDEPENDS += "linux-kexecboot"
 
-# Include Kernel image in kexecboot enabled images
+# Include kernel image in kexecboot enabled images
 RDEPENDS_kernel-base = "kernel-image" 
 
-# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
+# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 3f0b8003f5..c185deb555 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r4"
+MACHINE_KERNEL_PR = "r8"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 9f48f750e7..8e90453d4c 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,13 +1,30 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r33" 
+MACHINE_KERNEL_PR = "r37" 
 
 KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
+# Only build u-boot, xload is optional
+EXTRA_IMAGEDEPENDS += "u-boot"
 
 MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+
+# TI DVSDK stuff:
+CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
+CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
+DSPCFG ?= "OMAP3530SHMEM"
+DSPLINKDSPCFG ?= "OMAP3530SHMEM"
+DSPLINKGPPOS ?= "OMAPLSP"
+GPPOS ?= "OMAPLSP"
+DSPLINKPLATFORM ?= "OMAP3530"
+DSPLINKSOC ?= "3530"
+DSPPOWERSOC ?= "omap3530"
+LPMDSPPOWERSOC ?= "omap3530"
+PLATFORM ?= "omap3530"
+TARGET ?= "o3530_al"
+XDC_PLATFORM ?= ti.platforms.evm3530
+
diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc
index cf3de9c56f..c8770e0783 100644
--- a/conf/machine/include/tune-ep9312.inc
+++ b/conf/machine/include/tune-ep9312.inc
@@ -1,11 +1,14 @@
-TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
-# add "-mfp=maverick" for newer gcc versions > 4.0
+TARGET_CC_ARCH = "-mcpu=ep9312 -mfpu=maverick -mfloat-abi=softfp"
 
 #set arch to ep9312 for all generated packages
-PACKAGE_EXTRA_ARCHS += "armv4 armv4t ep9312"
+PACKAGE_EXTRA_ARCHS += "armv4t ep9312"
 BASE_PACKAGE_ARCH = "ep9312"
 FEED_ARCH = "ep9312"
 
 # Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish
 require conf/machine/include/tune-thumb.inc
 
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
+DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g"
+SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
+BUILD_OPTIMIZATION = "-O"
diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geode.inc
index cae285a91c..eda332a74e 100644
--- a/conf/machine/include/tune-geodegx.inc
+++ b/conf/machine/include/tune-geode.inc
@@ -1,6 +1,5 @@
-TARGET_CC_ARCH = "-march=geode"
+TARGET_CC_ARCH = "-march=geode -mtune=geode"
 BASE_PACKAGE_ARCH = "geode"
 PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
 
 FEED_ARCH = "geode"
-
diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc
deleted file mode 100644
index 63e6678947..0000000000
--- a/conf/machine/include/tune-geodelx.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Geode CPU has it's own target in GCC 4.3
-# in older versions k6-2 is closest
-#
-TARGET_CC_ARCH = "-march=geode"
-BASE_PACKAGE_ARCH = "geode"
-PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
-
-FEED_ARCH = "geode"
-
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index c6dafc19d9..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -1,10 +1,8 @@
-# Zaurus specific configuration for kernel 2.6
+# Zaurus common settings
 # Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
 
-MACHINE_KERNEL_VERSION = "2.6"
-
 ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
@@ -17,34 +15,38 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
 SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
+PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-IMAGE_FSTYPES += "jffs2"
+IMAGE_FSTYPES += "jffs2 tar.gz"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
-MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost "
+MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 
 MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
+MACHINE_EXTRA_RDEPENDS_collie = ""
 
-# Fixme ?
-#########
+# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel
 # Here we just need snd modules
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 
-KERNEL_IMAGE_MAXSIZE = "1294336"
+# For tosa: OHCI suspend/resume fixup
+# wlan-ng is now in kernel (2.6.29)
+# Fixme ? module-snd for tosa
+MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
 
-ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
+# Fixme ? module-snd for collie
+MACHINE_EXTRA_RRECOMMENDS_collie = ""
 
-require conf/machine/include/kexecboot.inc
+require conf/machine/include/zaurus-kernel.inc
+require conf/machine/include/initramfs-kexecboot.inc
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
new file mode 100644
index 0000000000..d9f1c1ba85
--- /dev/null
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -0,0 +1,13 @@
+# Zaurus common kernel settings
+
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
+PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
+
+KERNEL_IMAGE_MAXSIZE = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+
+ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
index f46d4f5822..37311ad965 100644
--- a/conf/machine/micro2440.conf
+++ b/conf/machine/micro2440.conf
@@ -4,21 +4,35 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.29"
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table_add-s3c_serial.txt"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "mini2440_config"
+UBOOT_ENTRYPOINT = "30008000"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440"
+
+# This can be used as alternative, stable kernel
+# PREFERRED_PROVIDER_virtual/kernel = "linux"
+# PREFERRED_VERSION_linux = "2.6.29"
+
 
 # This is not necessarily true, there is a 800x480 display as well
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "110"
+# used by matchbox-panel large icons look ok on both displays
+GUI_MACHINE_CLASS = "bigscreen"
 
 # used by sysvinit
 SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 
-MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet"
+MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet mmc mmcroot i2c spi"
+MACHINE_EXTRA_RDEPENDS = "rt73-firmware"
 
 require conf/machine/include/tune-arm920t.inc
 
diff --git a/conf/machine/mini2440.conf b/conf/machine/mini2440.conf
new file mode 100644
index 0000000000..f4fc17cdc6
--- /dev/null
+++ b/conf/machine/mini2440.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@Name: Samsung MINI2440 Dev Board
+#@DESCRIPTION: Machine configuration for MINI2440 Dev Board
+
+
+TARGET_ARCH = "arm"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_ENTRYPOINT = "30008000"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table_add-s3c_serial.txt"
+
+IMAGE_FSTYPES = "jffs2 ext3 tar.gz"
+
+MACHINE_FEATURES = "kernel26 uboot touchscreen screen lcd rgb16"
+MACHINE_FEATURES += "usbhost usbgadget"
+MACHINE_FEATURES += "i2c spi"
+MACHINE_FEATURES += "mmc mmcroot vfat"
+MACHINE_FEATURES += "ethernet"
+MACHINE_FEATURES += "sound alsa"
+
+KERNEL_IMAGETYPE = "uImage"
+
+require conf/machine/include/tune-arm920t.inc
+
+MACHINE_EXTRA_RDEPENDS = "rt73-firmware"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash -s 0x200 -n -e 16KiB"
diff --git a/conf/machine/mpc8315e-rdb.conf b/conf/machine/mpc8315e-rdb.conf
index 7d3a93b815..d7e733bd66 100644
--- a/conf/machine/mpc8315e-rdb.conf
+++ b/conf/machine/mpc8315e-rdb.conf
@@ -2,8 +2,8 @@
 #@Name: Freescale MPC8315E-RDB
 #@DESCRIPTION: Machine configuration for the Freescale MPC8315E-RDB
 
-# Development board with low power PowerPC SoC with MMU/FPU and PCI,
-# PCI Express x1, 2x SATA.
+# Development board with low-power PowerPC SoC with MMU/FPU and PCI,
+# 2x PCI Express x1, 2x SATA.
 
 TARGET_ARCH = "powerpc"
 
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
 KERNEL_IMAGETYPE = "uImage"
 
-PREFERRED_VERSION_u-boot ?= "1.3.2"
+PREFERRED_VERSION_u-boot ?= "2009.06"
 UBOOT_MACHINE = "MPC8315ERDB_config"
 UBOOT_ENTRYPOINT = "0"
 UBOOT_LOADADDRESS = "0"
diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
index 33a69f45b3..7db19696fa 100644
--- a/conf/machine/mtx-1.conf
+++ b/conf/machine/mtx-1.conf
@@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel"
 PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1"
+KERNEL_VERSION_mtx-1 = "2.4.27"
+MACHINE_FEATURES = "kernel24 usbhost vfat"
 
 # md: is the --pad=.. necessary? I believe not.
 # EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n"  
diff --git a/conf/machine/mtx-2.conf b/conf/machine/mtx-2.conf
index 438c1fed79..67cc5bf185 100644
--- a/conf/machine/mtx-2.conf
+++ b/conf/machine/mtx-2.conf
@@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel"
 PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2"
+KERNEL_VERSION_mtx-2 = "2.4.27"
+MACHINE_FEATURES = "kernel24 usbhost vfat"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 
diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf
index d6d14d86df..f6e9e8aad5 100644
--- a/conf/machine/mtx-3.conf
+++ b/conf/machine/mtx-3.conf
@@ -10,8 +10,21 @@
 TARGET_ARCH = "arm"
 require conf/machine/include/tune-arm926ejs.inc
 
-
+# begin overrides mtx-3
+#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627"
+PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4"
+PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4"
+PREFERRED_VERSION_gcc_mtx-3 = "3.4.4"
+PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1"
+PREFERRED_VERSION_binutils_mtx-3 = "2.16"
+
+KERNEL_VERSION_mtx-3 = "2.6.15.4"
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"
+PREFERRED_PROVIDER_hotplug_mtx-3 = "udev"
+MACHINE_FEATURES = "kernel26 usbhost vfat"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 
diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf
index cb1b129660..d3adce325b 100644
--- a/conf/machine/mtx-3a.conf
+++ b/conf/machine/mtx-3a.conf
@@ -4,8 +4,21 @@
 
 include conf/machine/mtx-3.conf
 
-TARGET_ARCH = "arm"
+#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627"
+PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4"
+PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4"
+PREFERRED_VERSION_gcc_mtx-3a = "3.4.4"
+PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1"
+PREFERRED_VERSION_binutils_mtx-3a = "2.16"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a"
+KERNEL_VERSION_mtx-3a = "2.6.16.6"
+PREFERRED_PROVIDER_hotplug_mtx-3a = "udev"
+
+TARGET_ARCH = "arm"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 USE_VT = "0"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/mx27ads.conf b/conf/machine/mx27ads.conf
new file mode 100644
index 0000000000..d7e8782a50
--- /dev/null
+++ b/conf/machine/mx27ads.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Freescale MX27ADS
+#@DESCRIPTION: Machine configuration for Freescale MX27ADS
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 4fe62b5f43..dde1bd1499 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,3 +27,7 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
+
+# xserver-kdrive 1.3.0.0 is still the only working version:
+XSERVER = "xserver-kdrive-1300-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 87cfe4781a..fd1e477465 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,10 +5,6 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-# wlan-ng Modules
-# OHCI suspend/resume fixup
-MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix"
-
 ROOT_FLASH_SIZE = "28"
 
 MACHINE_GUI_CLASS = "bigscreen"
diff --git a/conf/machine/tqm8540.conf b/conf/machine/tqm8540.conf
new file mode 100644
index 0000000000..7595f8a5dc
--- /dev/null
+++ b/conf/machine/tqm8540.conf
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@Name: TQM85xx
+#@DESCRIPTION: Machine configuration for the Ixxi TQ-Minimodule with MPC8540
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot jffs2"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_VERSION_u-boot = "1.3.2"
+UBOOT_MACHINE = "TQM8540_config"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the e500 core
+require conf/machine/include/tune-ppce500.inc
+
diff --git a/conf/machine/tx25.conf b/conf/machine/tx25.conf
new file mode 100644
index 0000000000..92a8fef3df
--- /dev/null
+++ b/conf/machine/tx25.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: KARO TX25 
+#@DESCRIPTION: Machine configuration for Freescale i.MX25 based Karo TX25 + baseboard
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camera"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.30"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+ROOT_FLASH_SIZE = "128"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \
+    --pad ; sumtool --eraseblock=0x20000 -n \
+    --littleendian --pad \
+    -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+    -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/conf/machine/tx27.conf b/conf/machine/tx27.conf
new file mode 100644
index 0000000000..a3e784c110
--- /dev/null
+++ b/conf/machine/tx27.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: KARO TX27 
+#@DESCRIPTION: Machine configuration for Freescale i.MX27 based Karo TX27 + baseboard
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camera"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+ROOT_FLASH_SIZE = "128"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \
+    --pad ; sumtool --eraseblock=0x20000 -n \
+    --littleendian --pad \
+    -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+    -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
author	Sergey Lapin <slapin@ossfans.org>	2009-06-26 22:32:52 +0400
committer	Sergey Lapin <slapin@ossfans.org>	2009-06-26 22:32:52 +0400
commit	c91a54aef8a39e7cbb2571574f56f2cf12104ff1 (patch)
tree	e68102d093c111affd9208b78df9c18aa837c3b8 /conf
parent	323edc5ef4c3d8572ee0b4fd185ca6e3166d6b45 (diff)
parent	84efca2e2ad21d3d7cea68c0327f91aaf773eb67 (diff)