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

16 files changed, 325 insertions, 69 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8b6956453b..c4af34e8d7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -107,6 +107,7 @@ EXEEXT = "${HOST_EXEEXT}"
 
 BASE_PACKAGE_ARCH = "${HOST_ARCH}"
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+PACKAGE_EXTRA_ARCHS ?= ""
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
@@ -120,7 +121,7 @@ BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 QEMU_OPTIONS = ""
 QEMU_OPTIONS_iwmmxt  = "-cpu pxa270-c5"
 QEMU_OPTIONS_armv6   = "-cpu arm1136"
-QEMU_OPTIONS_armv6-novfp = ""-cpu arm1136"
+QEMU_OPTIONS_armv6-novfp = "-cpu arm1136"
 QEMU_OPTIONS_armv7a   = "-cpu cortex-a8"
 
 ##################################################################
@@ -715,3 +716,22 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
+
+# We want madwifi if all of the following are true:
+# - distro has pci, wifi, and madwifi in its features
+# - machine has pci in its features
+COMBINED_FEATURES += "${@base_ifelse( \
+    base_contains('DISTRO_FEATURES', ('pci', 'wifi', 'madwifi'), True, False, d) and \
+    base_contains('MACHINE_FEATURES', 'pci', True, False, d), \
+    'madwifi', '')}"
+
+# We want hostap if all of the following are true:
+# - 'wifi' and 'hostap' are in distro features
+# - either 'pci' or 'pcmcia' are in both distro and machine features
+COMBINED_FEATURES += "${@base_ifelse( \
+    base_contains('DISTRO_FEATURES', ('wifi', 'hostap'), True, False, d) and \
+    ((base_contains('MACHINE_FEATURES', 'pci', True, False, d) and \
+      base_contains('DISTRO_FEATURES', 'pci', True, False, d)) or \
+     (base_contains('MACHINE_FEATURES', 'pcmcia', True, False, d) and \
+      base_contains('DISTRO_FEATURES', 'pcmcia', True, False, d))), \
+    'hostap', '')}"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 26edb2eb4b..7d69f6e04f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -198,6 +198,10 @@ sha256=d2d21f995d1a152ca2d8beea6d37f31e48cca034b82ceb7322f39422e849e9cf
 md5=1ed8e1931f56ad3fc53ba485391434b5
 sha256=e9cc2ed4db0f48a9fdb353f6774df585ac1bc3a0f7c77fcede1c1c27497882bd
 
+[http://hal.freedesktop.org/releases/DeviceKit-power-009.tar.gz]
+md5=535703fa7b9c323d6388b5aff28cfeeb
+sha256=438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55
+
 [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz]
 md5=2449bfe21d6589c96eebf94dae24df6b
 sha256=3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989
@@ -338,6 +342,10 @@ sha256=ffae146dc20458698acf5ccc384dc32317cea1df0c95b44b5d47cca8b26bc986
 md5=83b738d805e17c226f43bbac453a0631
 sha256=14b0fb8ce8a97a0bf7d8f5be57f6bb67dc9e5273f1f465f3babe994c44db3d87
 
+[http://ftp.gnome.org/pub/GNOME/sources/GConf/2.26/GConf-2.26.2.tar.bz2]
+md5=8b55d58dab13e821e048627aa4f92b8b
+sha256=717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed
+
 [http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-2.6.1.tar.bz2]
 md5=194fab4e2e87c7ae3c7fea926fd281bc
 sha256=31d894960e0d2eba8fa2746e4fde31983a1e49dc856a880adb59d5f251a690cf
@@ -1486,6 +1494,10 @@ sha256=deb7652a3c1360febbbffb5d0150e5ad8547063d37969ad24d13359f75a424ba
 md5=29ae9cac05423cf6a49f66eeb1a79eb6
 sha256=67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100
 
+[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.20.tar.bz2]
+md5=819c4f21e3e913eacefd32993a8fbed7
+sha256=210ceedcb84bf3030e9f362d55b734312632ce72e348bd758536ec62a37aac97
+
 [ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2]
 md5=ba9b8010120701d0f6daf061d392cfa2
 sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
@@ -1938,6 +1950,10 @@ sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a
 md5=160c648e29637f2ed6301f4dfdecce21
 sha256=3ec786e6df9e1a935aff4848b6989cad8f87c1fa8813dc033b338e18b17138d8
 
+[http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.26/at-spi-1.26.0.tar.bz2]
+md5=3f2f7d29b45eff08adf56af0d31d3984
+sha256=bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
+
 [http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz]
 md5=b47d4fa958aaf83916b6a917626102cd
 sha256=9d1fff10d391cb64890bb8e0050d3f023520a8dd5aee43c4d3f9c6f8611da668
@@ -2022,6 +2038,14 @@ sha256=feb2639dd385a828ec75c6af12ac44a44aced40fb7a24cb63252f0d056f993b7
 md5=b1a9e28d9f54ea306bd85a4c84b25fb8
 sha256=1f3b2f2cbb5b0d8da0924970c66c3ecbfe13c4e4360b0af1db7545401a3747c9
 
+[http://ftp.gnome.org/pub/GNOME/sources/atk/1.26/atk-1.26.0.tar.bz2]
+md5=719229408019c548855673840679f156
+sha256=f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
+
+[http://ftp.gnome.org/pub/GNOME/sources/atk/1.27/atk-1.27.90.tar.bz2]
+md5=8906c67d015cc90e2e70a341d0752a6f
+sha256=b7255a400139d8c41bc7e2ac630ba4c6479e60e4a08295d0338e9edfdc3db00f
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.0.tar.bz2]
 md5=5e699af22a934ea3c1c1ed3742da0500
 sha256=a838937ee54c9e794df3b0995935c1e35cad4a360c83922380f9429195ea7059
@@ -2242,6 +2266,10 @@ sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b
 md5=47d68219a5ee768f1ebd2502a9c3c6f2
 sha256=f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea
 
+[http://pawsa.fedorapeople.org/balsa/balsa-2.4.1.tar.bz2]
+md5=2ad6ebb3f058e5fbe9ec5e0f0017db28
+sha256=06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
+
 [ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
 md5=5afcef5d6047f14cd5f65d2fdbd86fb2
 sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
@@ -5414,6 +5442,10 @@ sha256=e91e576ed22e5ba9a930d4292e3dbec4fe4ec7276029d82188cc91db117e21d4
 md5=b591df36af8f1b23dd175be33b5de073
 sha256=32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629
 
+[http://ftp.gnome.org/pub/GNOME/sources/eel/2.26/eel-2.26.0.tar.bz2]
+md5=dfa105ccabd53efe4166dcfac75e2393
+sha256=11ad07d8d371f9165fab6cc5462f59cd253f9cc835d77a54330fecafe9c0a555
+
 [http://ftp.gnome.org/pub/GNOME/sources/eel/2.6/eel-2.6.1.tar.bz2]
 md5=6dd46ef1905271cd1171a0bdddabee22
 sha256=889c8cff395bc488a6ccfb3fc22fd241a12c33f114bb7d7ec4138d5999da9c5d
@@ -6278,6 +6310,10 @@ sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d
 md5=c315e06cdfe9ee76aa4831ece1ed5df3
 sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
 
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.2/source/firefox-3.5.2-source.tar.bz2]
+md5=136867f95c86f3988b7f825e874b85de
+sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2]
 md5=ff6bf463300cb56bcf750973b2af3d80
 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
@@ -6974,6 +7010,10 @@ sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
 md5=0f6e7ecca08e6e108dc06337f5b5cabf
 sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
 
+[http://fribidi.org/download/fribidi-0.19.2.tar.gz]
+md5=626db17d2d99b43615ad9d12500f568a
+sha256=49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
+
 [http://www.tads.org/frobtads/frobtads-0.8.tar.gz]
 md5=c31b44a7bea51f04958358e575bde731
 sha256=1aa4fe2f4a8d79f7f4542d96f0b179886c04cbdfd6a972a19ab80437e6150549
@@ -7094,6 +7134,10 @@ sha256=fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
 md5=813782a4f23211386c1ea91dc0ac7ded
 sha256=fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
 
+[http://downloads.sourceforge.net/fuse/fuse-2.7.4.tar.gz]
+md5=4879f06570d2225667534c37fea04213
+sha256=c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
+
 [http://downloads.sourceforge.net/fuse/fuse-python-0.2.tar.gz]
 md5=68be744e71a42cd8a92905a49f346278
 sha256=89f3e9ac096759e10b6292632216c9653d7e35c2c99847267173d94afdf85b92
@@ -7242,6 +7286,10 @@ sha256=b678dd4354e0305fc57fef9aa4fd1f316e8a5de33e5048e712fbc32d42ecea7c
 md5=c4e5d90974591ffadb4c934b490146fc
 sha256=c0c315c4190ce1f4ac977cb1e425a11879d5e7d78067207257387299f4d111ed
 
+[http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.27/gcalctool-5.27.5.tar.bz2]
+md5=abaaedfdba2f5905d9c57ae73105b84f
+sha256=f117903e3753920d16ca2e9f7185a02b3925fe94958a4c65efc2663cf61ca4de
+
 [http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-5.5.21.tar.bz2]
 md5=130baf0910aec9c0c5afad8007da90de
 sha256=e5a0f289969d070f4f10f25fb77efdf693805177b07d4eb2dbfe9fe91c2fdab0
@@ -7378,6 +7426,10 @@ sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
 sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.4/gcc-4.3.4.tar.bz2]
+md5=60df63222dbffd53ca11492a2545044f
+sha256=e572453bdb74cc4ceebfab9ffb411d9678343dff5bf86e9338d42fdd0818aa65
+
 [ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.0/gcc-4.4.0.tar.bz2]
 md5=cf5d787bee57f38168b74d65a7c0e6fd
 sha256=c5fe6f4c62ee7288765c3800ec9d21ad936bdcb5a04374cc09bd5a4232b836c9
@@ -7430,6 +7482,10 @@ sha256=e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc
 md5=845321d47b34f6ae19ac7e930c454e3d
 sha256=666ba1186b2697c3a99ee943775fbc7a7aa18f3c8cc3d335a2581dea62f812bf
 
+[http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.26/gconf-editor-2.26.0.tar.bz2]
+md5=2dc76415b22d805cfacfcd5fb98f185c
+sha256=2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f
+
 [http://www.boutell.com/gd/http/gd-2.0.21.tar.gz]
 md5=3134158635f5048dba99281c6b712a54
 sha256=c3b8b7b57019927dad40870c379eecfa6389443f7e2096aa0157a0224d400da1
@@ -7502,6 +7558,10 @@ sha256=0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2
 md5=31139d7a79096463b127b4790058b056
 sha256=8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f
 
+[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.26/gdm-2.26.1.tar.bz2]
+md5=c2c15f8b741962f278fa7e790aaa9a2b
+sha256=34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
+
 [http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2]
 md5=c6c22c7f9feff81a15f5c8ece03b87c1
 sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
@@ -7606,6 +7666,10 @@ sha256=8140ff430e89c8564efabbc24da0d9b2858d5ac5e982dab9923eaf3b46a8aacb
 md5=bcae4dc646440ba8129854621f56acc6
 sha256=5af6001401a6bc04c075474be5d8aeb2bdb2ca3e509022c2fc55ca7c7f310256
 
+[http://ftp.gnome.org/pub/GNOME/sources/gedit/2.26/gedit-2.26.2.tar.bz2]
+md5=ef8c98051c03d0caf0c75456e48c25b0
+sha256=7ce4919b4742ad6aad9dbfb2b962434d70dbcf9c63bb513870f3276deb28bee0
+
 [ftp://ftp.billsgames.com/unix/x/gemdropx/src/gemdropx-0.9.tar.gz]
 md5=fd0337e89778e2dba74461c555ea8e42
 sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f
@@ -8110,6 +8174,10 @@ sha256=f033f6f39c32fc17ecce63087e41408671a3a43d698c83de2528af3fc7276d28
 md5=1a0df362e15e7f850b8361b5102f1f16
 sha256=ca6c46b87748cabd61e7d5ef892f09f433eaea324e63637f7de1f0217465cd31
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.21/glibmm-2.21.2.tar.bz2]
+md5=3d0f763e408a71700090fff4d3dd110c
+sha256=5fb1f4f68625811a70fb580b945c2f93925569591af5444eb074aed6956366ca
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2]
 md5=952cdde2d6aef201c528d431036d71e1
 sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
@@ -8302,6 +8370,10 @@ sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
 md5=89e47677fb72695c75d2cefac84ff9f1
 sha256=0e807cfe74a684c494a0949b7f96d231660f323253a89053e3ec32c4f518c8d9
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.26/gnome-common-2.26.0.tar.bz2]
+md5=196daa38cb21d91da1d6ec085f1e158b
+sha256=f6233ee73886c5ac31890c1a9b9f216e5f14558467dea7b0a61ef3c4cf51d84d
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.4/gnome-common-2.4.0.tar.bz2]
 md5=9f5163e616b2a02af633de9c82557fa0
 sha256=9509137496606b101c6f570579b9d10ae11f531a8f8d9bfc5d113534b62376d7
@@ -8530,6 +8602,10 @@ sha256=ebf81236c9405ba47e7a21767c2372f2c3abb44cc671bac8662d2aeb3e746dbc
 md5=02054115dc86617da2a80eb87a1f988b
 sha256=559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.26/gnome-python-2.26.1.tar.bz2]
+md5=e5dcae40b2c291126843680dbed924a8
+sha256=ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.23/gnome-python-desktop-2.23.0.tar.bz2]
 md5=d8f8e61d99402e8b0a82d3c8d6e873be
 sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
@@ -8542,6 +8618,10 @@ sha256=400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8
 md5=08896c63d71ce44d20fafbaf9c0edc78
 sha256=c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2]
+md5=9f3b7ec5c57130b96061cb486b79c076
+sha256=ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.24/gnome-session-2.24.1.tar.bz2]
 md5=5bf6f5753eab034638aee80d993801d2
 sha256=9fc3f6d0dc7e664ff2b1507369183e5d0f1b17fc9f6643bf5e6a3ff8b6e7c211
@@ -8558,6 +8638,10 @@ sha256=4fbd2eccb335fa92487b3307bd83c4f468342f1787856377abbb6ad862271451
 md5=edd7f02e30683054b94a89aa62c74d1e
 sha256=cf2f96f3c91749fdcec39d3eb89273f6d3a47cc7bc0c5faa0915808409c9d563
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.26/gnome-terminal-2.26.2.tar.bz2]
+md5=f4f64b9b67c7a3147799ee10f7cf00e1
+sha256=f937939eca0082dc7f3f9ddab72d612433ad948aac7e158ed75f5d7053e8d0e0
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.22/gnome-themes-2.22.2.tar.bz2]
 md5=1989167d700e835fe57993c6be90434c
 sha256=b6047835d6fae7269825028c4f7da2c1ff380c023fbd58ac69fdea8a707bac77
@@ -8590,6 +8674,10 @@ sha256=cd95ec5a4808799f033dcb9daf37ed38436c594d4014e5804967fa9e5893e91f
 md5=369105fd82cb99e69e63acab8f3b89b7
 sha256=622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2]
+md5=100f9af16dc659e375ee8da45175a28d
+sha256=bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-2.6.0.tar.bz2]
 md5=4d0323cf015dd006210fcacd4bfe7420
 sha256=e2094c83a810319674e9c5ea24ac1325e8ea31e3df2e2efd41c70a07742caa6d
@@ -10086,6 +10174,10 @@ sha256=11d65e787ad24596af3f84744655f7c6ad0c747e2c285248dda4e5893d0b317a
 md5=a094ea86d4cea4f23ef2eb8c6e7bfc10
 sha256=e17b33586d9f4ff656ed04559ed765b50affc19309074ef5bdf4ff62f5a1c863
 
+[http://ftp.gnome.org/pub/GNOME/sources/gthumb/2.10/gthumb-2.10.11.tar.bz2]
+md5=498c583800a05593f7493e8f27991c7d
+sha256=68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e
+
 [http://downloads.sourceforge.net/gthumb/gthumb-2.6.9.tar.gz]
 md5=2819ec911a7cc4f46b95240b65f2b3e2
 sha256=b02423f0dc9f82a3e1a56cfd470c1cee5d351654fdc55c1a3cd5cff150828b3c
@@ -10326,6 +10418,10 @@ sha256=38c238ec57bf22023bbc50f70ecbaee8c06b817b9e11f1a3a0ae7faf95cc1f26
 md5=dd065ab2e96e51aade949249c5556439
 sha256=92ddd976721e26377eaa59fea07707a0caa85eb874500868c1e6fdd9a21fe0dd
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.7/gtksourceview-2.7.3.tar.bz2]
+md5=ea30aecfbd55ebf40c6cf5a0f254f9ba
+sha256=bf4c6285683a70addedd3ae6b9d4b450d928be497834272c4cd705471333f1ec
+
 [http://downloads.sourceforge.net/gtkterm/gtkterm2-0.2.3.tar.gz]
 md5=a49f93d15909dbd2e7011428ae01f0f0
 sha256=fb68b18d752ae2379f144186b94743be991af1a42c88bc1e6f0685e45cb1d573
@@ -10422,6 +10518,14 @@ sha256=17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
 md5=df8f624587adfabe7009838ce6d8d5fd
 sha256=0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2
 
+[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.3/gvfs-1.3.2.tar.bz2]
+md5=73a7aecfba767f80146cbd5d37598e8b
+sha256=f4bddab378a3a197418e5e2229e7ff967c03adf049e33c5516745db35538b6de
+
+[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.3/gvfs-1.3.3.tar.bz2]
+md5=2f1c65dcde8fc4d0603e11a8ec3fc178
+sha256=453476904745e355a69987bcd20c5db1bc9a1757022f8dd8c0f3b7142f3a00fd
+
 [http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz]
 md5=238f5ef66317bb24c3d4018a7d1e9ec3
 sha256=d5baec578b22407e3fc78cc47393942f9704f1ab7b8d1c012577037d3421f90e
@@ -11746,6 +11850,10 @@ sha256=252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946
 md5=2a6ef018870fca9b7df85401994fb0e0
 sha256=252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946
 
+[ftp://aeneas.mit.edu/pub/gnu/ghostscript/jpegsrc.v6b.tar.gz]
+md5=dbd5f3b47ed13132f04c685d608a7547
+sha256=75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
+
 [http://www.ijg.org/files/jpegsrc.v6b.tar.gz]
 md5=dbd5f3b47ed13132f04c685d608a7547
 sha256=75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
@@ -12890,6 +12998,10 @@ sha256=18dc03fcf7514b0b0b0597e39c79353e00dd9d057aedaa5e14d4f08b8f92065f
 md5=ac885805d1918026a18b560f4015bc66
 sha256=46d66be76f962cd6f921011c60409c1d5070db4b01619e6d3e5093705665e7a7
 
+[http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2]
+md5=d0ce67f2ebcef1e51a83136c69242a73
+sha256=d5531ae3a206a9b5cc74e9a20d89d61b2ba3ba03d342d6a2ed48d2130ad3d847
+
 [http://downloads.sourceforge.net/libassa/libassa-3.4.2-2.tar.gz]
 md5=f619b4f01aeda6d5f2679be9dcec5a51
 sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
@@ -12938,6 +13050,10 @@ sha256=d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754
 md5=998a576ad26784ac87eab99e96013527
 sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
 
+[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-2.24.1.tar.bz2]
+md5=8868b6083392964a6969547ceb8d7cd1
+sha256=42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
+
 [http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2]
 md5=078942cb9c6a1a31f93958e993353f45
 sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8
@@ -12958,6 +13074,10 @@ sha256=2dd02787e5bad91e1efbfe2fe041eefe8cf13ebce9607d6dd9764c69f37233a8
 md5=22bd67a0a8b7f156c02c5fc08fb1fa24
 sha256=2963b3f0f348faa43eb84083ce93070ec82844205744219dec2df46ed2305775
 
+[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.24/libbonoboui-2.24.1.tar.bz2]
+md5=9ff3ec1c7aefd0b1a15a5b21ecc7b4e4
+sha256=322536bdc23a70287f229168af2538a7b36c1b5041626ba15e22902228750c29
+
 [http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.6/libbonoboui-2.6.1.tar.bz2]
 md5=ee26630368b541dc101a65e46e67f5c4
 sha256=9a7596434959dbecc975c5c90021da2990189016f3fc65d7362362162a4156aa
@@ -12974,6 +13094,10 @@ sha256=b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272
 md5=01a1952e861defa6de9d193558f2a732
 sha256=04a70135de89ec7971a7ffa6516cf7699329cc01056595d524a6250a9d049709
 
+[http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz]
+md5=b182ab134a911ba6c42ea2b727eda13e
+sha256=879f9ab798ae287048518ebb55132bbab905bea4b830a90f27a04df6d08d2a5e
+
 [http://kernel.org//pub/linux/libs/security/linux-privs/kernel-2.4/libcap-1.10.tar.bz2]
 md5=4426a413128142cab89eb2e6f13d8571
 sha256=66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc
@@ -13386,6 +13510,10 @@ sha256=d22335af6a17ec44799da82671778d2072499b26c5773ab913d9ba20d159d20f
 md5=a5a2a833d098926c3d289aeae452cc53
 sha256=d22335af6a17ec44799da82671778d2072499b26c5773ab913d9ba20d159d20f
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgail-gnome/1.20/libgail-gnome-1.20.1.tar.bz2]
+md5=5c5b71af5a8ab2a9403bdae52b20e46c
+sha256=848485971628ff9be294e2b3ad5410b184e4bf99c1112a767f7ac78bdc0b5d5d
+
 [http://www.galago-project.org/files/releases/source/libgalago/libgalago-0.3.3.tar.gz]
 md5=94d5223445deb1ed95973424d4958386
 sha256=148bc83e4ab6e87a6f26b60efdffc1258752a42079783e6f2b080f287e8b15fc
@@ -13546,6 +13674,10 @@ sha256=5ceadd704327c2967868b3c0c81b5e600e1c6fd4f8efcbaaf89f9b18aa8bb5cf
 md5=109b71b02e0c976d65b46129d0ad69d1
 sha256=c1d7301ecea3719e307182222ba19375b74017580d58e4a25f4ae15c8c8f9c3f
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2]
+md5=9bbc635e5ae70e63af071af74ba7e72f
+sha256=80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.6/libgnomecanvas-2.6.1.1.tar.bz2]
 md5=040257b0231fd5fc507f731d73d9738b
 sha256=fd117570a94e527f76241bc54d2dd53cbea5e17455f5795b5e52afee25eccaca
@@ -13610,6 +13742,10 @@ sha256=1f112ea46c51e063f4085e27b97c88d4e23164eb07056edbbee1a190abe713ec
 md5=7d50e1fc4c1ee3c268b26e8dfe7e677b
 sha256=9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.24/libgnomeui-2.24.1.tar.bz2]
+md5=8e7d36dd1decfcf5cc4d5cb93bc4d217
+sha256=a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.6/libgnomeui-2.6.1.1.tar.bz2]
 md5=16e6717b5d7da982db00fea6167188ef
 sha256=0c6c91a59e411d196fe56c814bd368224b04e11a341a8ad552398035e8f19d93
@@ -13846,6 +13982,10 @@ sha256=0abae1eef7210e4decab7f89ea5b3a012c06859e91923a7212ca50856bffd500
 md5=b96016d7b35c66cf251189e9851ee252
 sha256=c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.26/libgweather-2.26.2.1.tar.bz2]
+md5=cef0447b62235c4662aa9691dd9a6c92
+sha256=70cf977060a5e71ade98346070856f09fbf33f6d88f4d49632d7ae0f6b314834
+
 [http://www.handhelds.org/~mmp/files/libhal-nm-0.0.2.tar.gz]
 md5=2f0882a711759113b2388a790abe8fd8
 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981
@@ -14314,6 +14454,10 @@ sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
 md5=757371e21e4f3653ce4d12d3ba0be1e0
 sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a
 
+[http://ftp.gnome.org/pub/GNOME/sources/liboobs/2.22/liboobs-2.22.0.tar.bz2]
+md5=1b090ecd6c0df58b131795ff9a5c9057
+sha256=b35760855d7d1def532e9e808cecde29b75cec455b238590072abf4a8206536e
+
 [http://download.ofb.net/liboop/liboop-1.0.tar.bz2]
 md5=88fc8decf99fd75d2af40e0a005fa0d3
 sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2
@@ -15266,6 +15410,10 @@ sha256=a69d690af93646be28228553c05b71d9830e3bf2ea301f6ed369a2c1cddf2ddf
 md5=ee167645becd11309d64c6ff3a1600ff
 sha256=477b72ba4968e9a49c78e08a5335df7f71f71d787222224345f33f0b888f801b
 
+[http://ftp.gnome.org/pub/GNOME/sources/libxklavier/4.0/libxklavier-4.0.tar.bz2]
+md5=1b714ba04835fb49511f9e1444a5ea4c
+sha256=210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71
+
 [http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.14/libxml++-2.14.0.tar.bz2]
 md5=4f5644788dfd6ba87ce7c9b6cc28890d
 sha256=dcb0cc5d1871e91859071a0bfa9de1a66703f0482ef5fc745300aa1a2df04cbf
@@ -15374,6 +15522,14 @@ sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
 md5=949c33a81e83f7718a47280bef21b90c
 sha256=197bd2b57c5e2b9bfc30bb565a4c44fbea82daa20a31fa8ba490dd61dad69f2a
 
+[http://www.lighttpd.net/download/lighttpd-1.4.23.tar.gz]
+md5=41dfad5c366d34d83c3d2b46d4c08f5c
+sha256=8555db22ed7d429160701555611d8cd5eff42fc7e6e3ad3b050279c9b2145469
+
+[http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz]
+md5=1e975d827ad96e1942df73f63512178e
+sha256=da2340aca2eaf451243d2e4c2bf66aa4b80cc0abaef96860da8daf5db1cae12f
+
 [http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-0.6.tar.gz]
 md5=c3e1b6c428218968e2963182c1df1fdc
 sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a
@@ -16138,6 +16294,10 @@ sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
 md5=b1ab85e4dc1eb1323d77fef47a2cb71c
 sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
 
+[http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2]
+md5=29d5ffd03a5a3e51aef6a74e9eafb759
+sha256=c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e
+
 [http://www.oberhumer.com/opensource/lzo/download/lzo-1.08.tar.gz]
 md5=ab94d3da364c7cbd5b78d76f1875b0f6
 sha256=bcead46b0bd887c3987e977a0a7d4c547b0f70f926d45e253784137569f57b9a
@@ -18746,6 +18906,10 @@ sha256=070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d
 md5=654dcf9f3987d49a35b4bb92e464234a
 sha256=1391df01a619c6df0049706fb7bd4c690c55439b7bee4d5e8c564525cefdede2
 
+[http://downloads.sourceforge.net/owfs/owfs-2.7p24.tar.gz]
+md5=e52d87fafbeed156354dff3c34203d3d
+sha256=aec28206a8345f982a3e98b7b889721340899483e579a81aaf72c2cd59bb144e
+
 [http://openzaurus.org/mirror/oz-compat_0.5.tar.gz]
 md5=0005d4068b2227e26f4583c1a7415e97
 sha256=8db9b3948c607315f0ba0df61b32f747bec5479c38051d3e0e55b31b82c81af5
@@ -21790,10 +21954,6 @@ sha256=e8890518a8818e72d44daa1448246df8a6b5958215835f4c72abc833077d1f68
 md5=86a847f3128a43a9cf23b7029a656f50
 sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732
 
-[http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
-md5=ceef10579a75c92483171f3bd7f77df2
-sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
-
 [http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
 md5=ceef10579a75c92483171f3bd7f77df2
 sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
@@ -22282,6 +22442,10 @@ sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 md5=597d7ff7edb42a18421c806ffd18a136
 sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 
+[http://www.riverbankcomputing.com/static/Downloads/sip4/sip-4.8.2.tar.gz]
+md5=7ae60712aa6b4095a8cdab11b437f8f0
+sha256=2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9
+
 [http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
 md5=45e5a44803181e2bf3361d562060c904
 sha256=5eef70f4e0a8f0f4628550807da3036f8b3086864bf4bcf5ab6d22ac3a6efd81
@@ -22982,6 +23146,10 @@ sha256=c6b2ee967ae04776fd60a47dc283570917e387dbcffc907a0dfc91f567c139f7
 md5=08fcda4a46454bfc66b97fba2d385f8c
 sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a
 
+[http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-0.8.2.tar.gz]
+md5=2fb20b04c0e426a1e894a4c4bf22cf87
+sha256=10fd6f07264d3fbd92c03858a99637cd4b9d98ab00fb4d31720adce0c1ed7af4
+
 [http://swfdec.freedesktop.org/download/swfdec/0.9/swfdec-0.9.2.tar.gz]
 md5=7be5e39236e2d6efa61a18e83e5ab73d
 sha256=7d56a3044c19e7ca4b492f3739d9aa6f6bdb6e51ecf4daa5d29c035ae430f1ef
@@ -22994,6 +23162,10 @@ sha256=84962251e647fdcdcf111bef0c478f7d3679ae104267ba72e59ad749c6955cc2
 md5=c5958f3b003190b21977495021ac2b28
 sha256=0d7927f2e791321b2867c120eb4140d9017c59b77925eb909b2a03f3ef2a8fe4
 
+[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/swfdec-mozilla-0.8.2.tar.gz]
+md5=716632e0d35b3c1582c180569ba30346
+sha256=49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5
+
 [http://swfdec.freedesktop.org/download/swfdec-mozilla/0.9/swfdec-mozilla-0.9.2.tar.gz]
 md5=5e19c365d02f1ece2e7caec13c2b23d4
 sha256=8c8cfb52b47efabefab90577fb118ab2699c803cebbc82891700f8e2d712343b
@@ -23154,6 +23326,10 @@ sha256=c087b112da0afd1c50ba8a8a2727c4cabfb1e5a57f43701c5abdc05865072649
 md5=ee6b84cc7b598b4e1a00a4a8c6676d4e
 sha256=d4d17102e014d3183a11719896061dc464c3d9a836caaf47b3b57da4ac23b52d
 
+[http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.82.tar.bz2]
+md5=c9f4e73e385c86b3a8faf9b615a04836
+sha256=1dbbf8cfd10fc07187fa8bfede23639fc95314976730f3474cb349e8bf6c6f61
+
 [http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.11.tar.gz]
 md5=8f9ca6140f428dc9adec9fa1c270a2dd
 sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
@@ -23190,6 +23366,10 @@ sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649
 md5=a77bde5adc5ee8822b0764ff786ccc09
 sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224
 
+[http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.6/system-tools-backends-2.6.1.tar.bz2]
+md5=c82a9d305c3a1bf924bba6b1bced3e86
+sha256=7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747
+
 [ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz]
 md5=7d5d61c026122ab791ac04c8a84db967
 sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
@@ -24750,6 +24930,10 @@ sha256=1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
 md5=a42c893a01e3d9818789be373e529422
 sha256=0e61bbccbc6689d8d9ea4842795498d3ff85079b870eda899cbbd7beb80866ec
 
+[http://ftp.gnome.org/pub/GNOME/sources/vte/0.20/vte-0.20.0.tar.bz2]
+md5=12dde859bc98e039336baff6e9e6b15b
+sha256=6612c72fe73279a23e296a70e19b3f5dd270c6d16cf0cc6a191475c1a16846f7
+
 [http://downloads.sourceforge.net/vtun/vtun-2.6.tar.gz]
 md5=309534fd03c5d13a19c43916f61f4bbf
 sha256=fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
@@ -28378,6 +28562,10 @@ sha256=0937b15ca5dcd6f49adff04096610cee1f70197e17d461aefa98ed52e5ea0b72
 md5=48958b1a3fc86261a26eea40a4f7d4af
 sha256=f539e6db53233fa75d5fa389b4807d54add312fc96de71b5eb7cf4f071719027
 
+[http://www.zsh.org/pub/zsh-4.3.10.tar.bz2]
+md5=74c5b275544400082a1cde806c98682a
+sha256=63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c
+
 [http://www.lachner-net.de/Frames/Software/zshopi_0.2.tar.bz2]
 md5=1343c4de6d586a1b4ed2b5c97d53e717
 sha256=6a136cbc7fdb38c73fe5862f21913e8fe63864063bba833c149c1098d758a12f
diff --git a/conf/collections.inc b/conf/collections.inc
index 0ef6e75ca9..831ca935e6 100644
--- a/conf/collections.inc
+++ b/conf/collections.inc
@@ -1,3 +1,7 @@
+# Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+#
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
 # Take a list of directories in COLLECTIONS, in priority order (highest to
 # lowest), and use those to populate BBFILES, BBFILE_COLLECTIONS,
 # BBFILE_PATTERN_*, and BBFILE_PRIORITY_*.
@@ -9,7 +13,24 @@
 COLLECTIONS = "${@' '.join(d.getVar('BBPATH', 1).split(':'))}"
 COLLECTIONS_UNPACKDIR = "${TMPDIR}/collections"
 
-def collection_unpack(collection, name, d):
+COLLECTIONINFO = "${@get_collection(d.getVar('FILE', 1), d)}"
+
+def has_collection(name, d):
+    for (uniquename, info) in d.getVar("COLLECTIONSINFO", 1).iteritems():
+        if info["name"] == name:
+            return True
+    return False
+
+def get_collection(file, d):
+    if not os.path.isabs(file):
+        file = bb.which(d.getVar("BBPATH", 1), file)
+    filedir = os.path.realpath(os.path.dirname(file))
+    for (uniquename, info) in d.getVar("COLLECTIONSINFO", 1).iteritems():
+        path = os.path.realpath(info["path"])
+        if filedir.startswith(path + os.path.sep):
+            return info
+
+def collection_unpack(collection, d):
     """ Unpack a collection archive and return the path to it. """
     import bb
     import os
@@ -22,7 +43,16 @@ def collection_unpack(collection, name, d):
         ("zip", "jar"): "unzip -q -o %s",
     }
 
-    outpath = os.path.join(d.getVar("COLLECTIONS_UNPACKDIR", 1), name)
+    basename = os.path.basename(collection)
+    try:
+        cmd, name = ((cmd, basename[:-len(e)-1]) for (exts, cmd) in handlers.iteritems()
+                     for e in exts
+                     if basename.endswith(e)).next()
+    except StopIteration:
+        bb.fatal("No method available to unpack %s (unsupported file type?)" % collection)
+    else:
+        outpath = os.path.join(d.getVar("COLLECTIONS_UNPACKDIR", 1), name)
+        cmd = "cd %s && PATH=\"%s\" %s" % (outpath, d.getVar("PATH", 1), cmd)
 
     try:
         collectiondata = open(collection, "r").read()
@@ -41,20 +71,12 @@ def collection_unpack(collection, name, d):
             pass
         else:
             if oldmd5sum == md5sum:
-                bb.note("Using existing %s for collection '%s'" % (outpath, name))
-                return outpath, False
+                bb.debug(1, "Using existing %s for collection '%s'" % (outpath, name))
+                return outpath, False, name
 
         bb.note("Removing old unpacked collection at %s" % outpath)
         os.system("rm -rf %s" % outpath)
 
-    try:
-        cmd = (cmd for (exts, cmd) in handlers.iteritems()
-                   for e in exts
-                   if collection.endswith(e)).next()
-        cmd = "cd %s && PATH=\"%s\" %s" % (outpath, d.getVar("PATH", 1), cmd)
-    except StopIteration:
-        bb.fatal("Unable to find unpack handler for %s" % collection)
-
     if not os.path.isdir(outpath):
         os.makedirs(outpath)
 
@@ -66,7 +88,7 @@ def collection_unpack(collection, name, d):
     md5out = open(md5file, "w")
     md5out.write(md5sum)
     md5out.close()
-    return outpath, True
+    return outpath, True, name
 
 def collections_setup(d):
     """ Populate collection and bbfiles metadata from the COLLECTIONS var. """
@@ -95,13 +117,7 @@ def collections_setup(d):
 
     collectionmap = {}
     namemap = {}
-    for collection in collections:
-        basename = os.path.basename(collection).split(os.path.extsep)[0]
-        if namemap.get(basename):
-            basename = "%s-%s" % (basename, hash(collection))
-        namemap[basename] = collection
-        collectionmap[collection] = basename
-
+    collectioninfo = {}
     unpackedthisexec = False
     oldbbpath = d.getVar("BBPATH", 1)
     bbpath = (oldbbpath or "").split(":")
@@ -109,45 +125,50 @@ def collections_setup(d):
         if not os.path.exists(collection):
             bb.fatal("Collection %s does not exist" % collection)
 
-        name = collectionmap[collection]
-        if not name:
-            bb.fatal("Unable to determine collection name for %s" % collection)
-
+        origpath = collection
         if not os.path.isdir(collection):
-            del collectionmap[collection]
-            unpacked, unpackedthisexec = collection_unpack(collection, name, d)
+            unpacked, unpackedthisexec, name = collection_unpack(collection, d)
             if unpacked:
                 collection = unpacked
-                collectionmap[collection] = name
                 for dir in glob("%s/*/" % collection):
                     if not dir in bbpath:
                         bbpath.append(dir)
             else:
                 bb.fatal("Unable to unpack collection %s" % collection)
         else:
+            name = os.path.basename(collection)
             if not collection in bbpath:
                 bbpath.append(collection)
 
+        if namemap.get(name):
+            name = "%s-%s" % (name, hash(collection))
+        namemap[name] = collection
+        collectionmap[collection] = name
+
+        collectioninfo[name] = {
+            "name": name,
+            "originalpath": origpath,
+            "path": collection,
+            "priority": priority,
+        }
+
         setifunset("BBFILE_PATTERN_%s" % name, "^%s/" % collection)
         setifunset("BBFILE_PRIORITY_%s" % name, str(priority))
 
+    d.setVar("COLLECTIONSINFO", collectioninfo)
+
     setifunset("BBFILE_COLLECTIONS", " ".join(collectionmap.values()))
     setifunset("BBFILES", " ".join(collectionmap.keys()))
 
-    # Strip out the fallback bitbake.conf from BB_RUN_LOCATION
     bbpath = [os.path.realpath(dir) for dir in bbpath if os.path.exists(dir)]
-    try:
-        bbpath.remove(os.path.realpath(bb.data.expand("${BB_RUN_LOCATION}/../share/bitbake", d)))
-    except (OSError, ValueError):
-        pass
-
-    from sets import Set
     d.setVar("BBPATH", ":".join(bbpath))