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

22 files changed, 323 insertions, 117 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f250ff6db5..2eb330e010 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1322,11 +1322,11 @@ sha256=2c55c84684a05934d5421707d76c1b6f5f45618a818a10d8dcf607027d93065e
 md5=f0ef2cea8acfbcc58d865c05b0c7e1ff
 sha256=8c4c70bf487f2e432046dce07cf4b77ff181667d0905f9cb1203ff95ff5dd5ff
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/Terminal-0.2.12.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/Terminal-0.2.12.tar.bz2]
 md5=adb419d279c9fc16d02291c052190717
 sha256=352205b03e9ed1b9080c61235fbc0fa15609410e724237441055a232a3b603dc
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/Terminal-0.2.8.tar.bz2]
 md5=cfe660ecf50e9d3b073576bbc4af6ab2
 sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7
 
@@ -1358,11 +1358,11 @@ sha256=b72813be2639d49dda2a3f87928b7ce185633f3afaa25300afbfb844b12deea4
 md5=4931662ea353384dec2a54a71b26ee8c
 sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-0.9.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/Thunar-0.9.0.tar.bz2]
 md5=0fc5008858661c0abd0399acbe30ef28
 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2]
 md5=218373aa45d74b6ba8c69c4d5af3bb19
 sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
 
@@ -5642,7 +5642,7 @@ sha256=531b957d9589950a96cbdbf6a8376f31203797948baed311553cc2d2870c78db
 md5=02aa4ffb835cbc9bdf96fcb915901cb3
 sha256=2dac596d5150174d0a2d9170db698c1d72584a8ab3b5eedf907086f53f76cc87
 
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.15.tar.gz]
+[http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-2.15.tar.gz]
 md5=72f59fa070a1dc7f664603b20134c383
 sha256=9aec45b395b6206e8eb85417f58186cdd0a307ed0f26f4b73af7031023a52225
 
@@ -6614,7 +6614,7 @@ sha256=53082354ae893fd385051c96214640cbeba527131ccf9f5320626252a4aef8d5
 md5=eb8b6d834d2224e17561593dc4158e4d
 sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/exo-0.3.101.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/exo-0.3.101.tar.bz2]
 md5=1c0eebb360f53eab70454b70e1bde36e
 sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
 
@@ -6622,7 +6622,7 @@ sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
 md5=ba87f84894498bf23ae39d849c55f98c
 sha256=278f702d890c89bd3923ce1bdaf29bd9f2c800c2e4cfd9e902d99663bba337e5
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/exo-0.3.4.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/exo-0.3.4.tar.bz2]
 md5=7a1af943b1df32b6f89ae91823118a22
 sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538
 
@@ -7034,39 +7034,39 @@ sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0
 md5=351cc4adb07d54877fa15f75fb77d39f
 sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
 md5=5704a8c36de84b408e069afb0c5bc1df
 sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.6/source/firefox-1.5.0.6-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.6/source/firefox-1.5.0.6-source.tar.bz2]
 md5=3a659d384744cab77f90920f6d529c89
 sha256=79e47279d839914e5052e1b1f21588c51d7f62c3f5e32205f790a60cafdbb5ac
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/source/firefox-2.0-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/source/firefox-2.0-source.tar.bz2]
 md5=03709c15cba0e0375ff5336d538f77e7
 sha256=dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.1/source/firefox-2.0.0.1-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.1/source/firefox-2.0.0.1-source.tar.bz2]
 md5=7a1fc804ed735c5b7e9b1498bac8b5db
 sha256=b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/source/firefox-2.0.0.3-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/source/firefox-2.0.0.3-source.tar.bz2]
 md5=24398e3d98673a2a92a01a8f771ca12a
 sha256=02169e4e7a095c426fd5caf56c6cfc2415f4fe54cef7f4e78556f350e2c94007
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2]
 md5=4210ae0801df2eb498408533010d97c1
 sha256=606e84ac02322aff692b9d4612cb8e27f5fa0da29e14bce7744927e0dad9c4b9
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2]
 md5=406d67174f8f74ab154a1b17d0881b27
 sha256=e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2]
 md5=8a1ac4a5940108a96458c5307a74c98d
 sha256=685df7c7f33fc71a8c2d0fb71e190d59e2dd92007c2ace1ad176e655fb3012d7
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2]
 md5=5fb6c6f3e973516df83a573348377a2f
 sha256=e0c279546d99d3d21c30cdae6649e0d3710a5db44edd1347b4f31e04cb729040
 
@@ -7086,15 +7086,15 @@ 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]
+[ftp://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/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2]
 md5=0b6ccb1e50d96b7127a18a69399fcf05
 sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
 
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2]
 md5=b3d92dfb40584141dc1068efc9bdfccc
 sha256=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb
 
@@ -11602,7 +11602,7 @@ sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
 md5=7b4aebf85040b357124de926807dc22a
 sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/gtk-xfce-engine-2.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/gtk-xfce-engine-2.4.2.tar.bz2]
 md5=00eb6a62defe6867d28a18569b96d151
 sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78
 
@@ -11610,7 +11610,7 @@ sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78
 md5=e836705d2933d0a77c6628285e10d982
 sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2]
 md5=e836705d2933d0a77c6628285e10d982
 sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
 
@@ -17098,15 +17098,15 @@ sha256=824fed10aea3bfb3504b0c5f4e3a5208ae795e88f64730a5b07d5f5de3e771a8
 md5=0eb951fd0fa9542dbe4fc3530b81a3b6
 sha256=19d6b2ac380fd3e613a3730e791f197f186f940bffec97f8a4f9443bb727d11d
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4mcs-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfce4mcs-4.2.2.tar.gz]
 md5=06c3d8ea6826d9a2fbcc1da6b86f1361
 sha256=95b84b2b109f20e0fa6e2489dda55c5931a438ebfa21c8b4238350b0abdd0a6f
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2]
 md5=7ee4eab238e773b9dbf3fa1472643f6e
 sha256=8f3cd90d4ea258ffa35b8723c1eae7ace31409baa85361889664084c6c5d1b6d
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfce4mcs-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfce4mcs-4.4.2.tar.bz2]
 md5=5ffe66a3eeb884839806ce929e5d2776
 sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e
 
@@ -17114,19 +17114,19 @@ sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e
 md5=5dc9343885c2c6f931318b2a1cdcc9db
 sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4menu-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfce4menu-4.6.1.tar.bz2]
 md5=5dc9343885c2c6f931318b2a1cdcc9db
 sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4util-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfce4util-4.2.2.tar.gz]
 md5=5f27635aa0ba5e40ffaf3031b530b36b
 sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2]
 md5=4b327c64c292b2e672f69a0789deb2b7
 sha256=988efce9b4fd7252475234be3ca3fe8b737125ebaadc8c448d1c5d4cbc8bb521
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfce4util-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfce4util-4.4.2.tar.bz2]
 md5=261e7a5df039493ad746e0c359211092
 sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d
 
@@ -17134,23 +17134,23 @@ sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d
 md5=eac51d58179cbcadc3f802450a8ec9cd
 sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfce4util-4.6.1.tar.bz2]
 md5=eac51d58179cbcadc3f802450a8ec9cd
 sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfcegui4-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfcegui4-4.2.2.tar.gz]
 md5=e88d6e8379eae60cee6dd6122bf3ae59
 sha256=bdd542e60ffbe4987b5ae765e581fe5bcfdfc4d623341d09aaff7794e90d4454
 
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/libxfcegui4-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/libxfcegui4-4.2.3.tar.gz]
 md5=5d2bae78c5ef66e914ae7a930bbdeb57
 sha256=655c8c8657c16cf4fb9400722beb1a65841c0851e27a138c08b1908d5e254142
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2]
 md5=98679c67ac65c376833deacec9fcbecf
 sha256=a3da5f3b70e65d6679cfb21fd2baf10baedceb8b099347987f9b6c5fa7cd329b
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfcegui4-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfcegui4-4.4.2.tar.bz2]
 md5=799a4869138c605126e8e71d58189bfd
 sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
 
@@ -17158,7 +17158,7 @@ sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
 md5=539cff747634b8ee6f0d2362ee78a286
 sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfcegui4-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfcegui4-4.6.1.tar.bz2]
 md5=539cff747634b8ee6f0d2362ee78a286
 sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
 
@@ -19366,7 +19366,7 @@ sha256=f1e187c61702a727bbd20bf5a66a310363257acc04b1f1c6e0b2e06e9b5dfa6e
 md5=71e6bd13fcca70372e9b7c7806d62b30
 sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/mousepad-0.2.13.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/mousepad-0.2.13.tar.bz2]
 md5=326075ac933e5da38cedbc20e80b7026
 sha256=f32cc263fb73b05c5bad17121073a2b37a7d5c8e411f780312c2701902e6637a
 
@@ -19378,7 +19378,7 @@ sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
 md5=d98854edb76d823ac20b266fdf5a64a1
 sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/mousepad-0.2.16.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/mousepad-0.2.16.tar.bz2]
 md5=d98854edb76d823ac20b266fdf5a64a1
 sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
 
@@ -20798,7 +20798,7 @@ sha256=1cb7c3968e3e01e7597f54b87ebc87a48c6c8e569db7e353adb91841db5b4190
 md5=9d1e6a9bd4d6dc9cae3c54c18c303ace
 sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/orage-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/orage-4.4.2.tar.bz2]
 md5=0c69e4c20350c3000d49350991d3a520
 sha256=ef08b96e5529f19a2f609525300fbea2019f1afb75fb3c85e474e6041f425abd
 
@@ -20810,7 +20810,7 @@ sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
 md5=24fa43dd86ec5af5a4766620fd972cf2
 sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/orage-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/orage-4.6.1.tar.bz2]
 md5=24fa43dd86ec5af5a4766620fd972cf2
 sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
 
@@ -24474,6 +24474,10 @@ sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0
 md5=55596c41572c5efcf4b2cae9c68c2152
 sha256=bbb73ebc3a22f53e75dfbaa1718eebcc5a3619bb200b50df42d5377b99ebf4d4
 
+[http://downloads.sourceforge.net/scim/scim-1.4.9.tar.gz]
+md5=975ba34b01304ea8166ac8ea27aa9e88
+sha256=f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0
+
 [http://downloads.sourceforge.net/scons/scons-0.96.1.tar.gz]
 md5=45b1c346edd8a0970210aeb1e82557c9
 sha256=67ea186c1c6270178da0c3411f8c94fcb6a070eb68c3d43f08f282b0728d0c7d
@@ -30370,59 +30374,59 @@ sha256=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
 md5=475f19a2ffbfab9a0886791c5f89c978
 sha256=2497487e51cb2e94dfe540b9084f625f8018eb0853a699d724be790b26d9fd15
 
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfcalendar-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfcalendar-4.2.0.tar.gz]
 md5=519ae7186ed4c083fdbe452cc24f8837
 sha256=36130c0535c34a5d7873a9ccf82aa45cd1aa5d0ad7191e4c7cc71faac9fbd3e7
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfcalendar-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfcalendar-4.2.2.tar.gz]
 md5=d964e45cc1d21f482f5e303129491987
 sha256=910a65a81b7efb18e638105a46cb1249df041df6e66fcfcb58ac7e95baaa7976
 
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xfcalendar-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfcalendar-4.2.3.tar.gz]
 md5=d2e2c8e010cca708295aeaf621086205
 sha256=ad8d141d23f48736180d3913a0600d1733d71a341fd1889e69f727a998cfa0a3
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-manager-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-mcs-manager-4.2.2.tar.gz]
 md5=9f6cdb3f11fc57a458fe7c91540181c9
 sha256=b075e7503089a1e0b7a156fb05871ba83c4a20d22b822a4599545b6a3e410c40
 
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-manager-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfce-mcs-manager-4.2.3.tar.gz]
 md5=029e7cc2b20a3de5f908483b4253f492
 sha256=9bc1d715ee77a3d910214dd2fe6f537ee39960177f869a781361535a8d9a1828
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2]
 md5=59d6d8f4f931b562b39ea1decdf9e29e
 sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2]
 md5=876a4b5d582de8fdc01457df2e7e1339
 sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz]
 md5=6e23972a2a0b3b3e7852bfc68dc0eeb8
 sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9
 
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz]
 md5=cdd1ca3ff7610a45658aa801b91da8dc
 sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2]
 md5=6234425227e1145319bd75ef52fa97f5
 sha256=f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2]
 md5=77fcc929058de530d4f91eb25de851a1
 sha256=e16610264256248bfd8ca227c7861000abf0c323611ad34913b06c41af0c9be5
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-utils-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-utils-4.2.2.tar.gz]
 md5=585e1fd48dee70c50271ac478e8adcd0
 sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2]
 md5=de6502dd93176b2a60e2e66bf052024f
 sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-utils-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-utils-4.4.2.tar.bz2]
 md5=119dd3f1daedfa41e3be89bad8997336
 sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
 
@@ -30430,19 +30434,19 @@ sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
 md5=1aa2362b11e79e56d52ce0d265faf1b6
 sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce-utils-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce-utils-4.6.1.tar.bz2]
 md5=1aa2362b11e79e56d52ce0d265faf1b6
 sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-appfinder-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-appfinder-4.2.2.tar.gz]
 md5=0ef8c944e8aa2db06719e02b2c40d70c
 sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2]
 md5=a4636f51d79eb68ba65098336d120d56
 sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-appfinder-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-appfinder-4.4.2.tar.bz2]
 md5=0bdd0b1e96a1e1cf50ce5d582758b992
 sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c
 
@@ -30450,35 +30454,35 @@ sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c
 md5=a1bc7d88100cfd92714a300be531589b
 sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2]
 md5=a1bc7d88100cfd92714a300be531589b
 sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2]
 md5=7d09d161efc7ef86b3b48791d98c8ae8
 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e
 
-[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
 md5=c9587fa78e877eee858a33391d0afd62
 sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2]
 md5=c9587fa78e877eee858a33391d0afd62
 sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2]
 md5=d3e3e64596a7efa857d2e6bb0cbd09bb
 sha256=72178637c479ba848747285e0c7dc53a3abfe26b6517df5e75c7449542017350
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-mixer-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-mixer-4.2.2.tar.gz]
 md5=fd5eb62c04d10659402a228b304f735b
 sha256=9d145dd0ad09c1bd1efe357bd0413fabc93945d7986d3f4662ac515625da93bc
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2]
 md5=9648fc403f9eb4baede230644bf5638d
 sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-mixer-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-mixer-4.4.2.tar.bz2]
 md5=c21cb5680f135dc86e5f0a6f9473003a
 sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a
 
@@ -30490,7 +30494,7 @@ sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
 md5=a99e2455445480ef5081fe69454a46fc
 sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-mixer-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-mixer-4.6.1.tar.bz2]
 md5=a99e2455445480ef5081fe69454a46fc
 sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
 
@@ -30498,15 +30502,15 @@ sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
 md5=659ecaf37f0f7ee9e31f7b25f9813778
 sha256=989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-panel-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-panel-4.2.2.tar.gz]
 md5=50699e6c8e4a79f0a4f962e12559c9d0
 sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2]
 md5=53f96a9db5628ac1c629c9e5ecd842e4
 sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-panel-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-panel-4.4.2.tar.bz2]
 md5=8f26b32c442bf9926f98f285a3c251dd
 sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
 
@@ -30514,7 +30518,7 @@ sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
 md5=73a366b9892152266b465d7d9c35bef4
 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-panel-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-panel-4.6.1.tar.bz2]
 md5=73a366b9892152266b465d7d9c35bef4
 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 
@@ -30522,7 +30526,7 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=88352816c84cbea57121b0c478976976
 sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-session-4.4.2.tar.bz2]
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
 
@@ -30530,7 +30534,7 @@ sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
 md5=7628be41ed3511a20cff5673d9d39858
 sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-session-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-session-4.6.1.tar.bz2]
 md5=7628be41ed3511a20cff5673d9d39858
 sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
 
@@ -30538,7 +30542,7 @@ sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
 md5=dc1c8704471c5b0104fa10c30eb60cb6
 sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-settings-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-settings-4.6.1.tar.bz2]
 md5=dc1c8704471c5b0104fa10c30eb60cb6
 sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 
@@ -30546,7 +30550,7 @@ sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 md5=d4d3018767ea9eb4b57cc57d4038023b
 sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfconf-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfconf-4.6.1.tar.bz2]
 md5=d4d3018767ea9eb4b57cc57d4038023b
 sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
 
@@ -30558,19 +30562,19 @@ sha256=111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
 md5=26c83a6fe245906cc05055abf877d0f2
 sha256=a3fe35b19aa957e5261a12ef78de2c62b47796aa612b2334088b3d98dcd77e8f
 
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfdesktop-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfdesktop-4.2.0.tar.gz]
 md5=1cacd48e0ab475f4fd55d79020d60c55
 sha256=45a6c30d33f9b887d13f0dd6458e9055dae6664c307b24a68594fcff73d22127
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfdesktop-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfdesktop-4.2.2.tar.gz]
 md5=746641ae286994c0f42d7c4f58a90716
 sha256=abba9b334012c8d3771939d8644e25d1560f18174e94eda155c65c87924f08d1
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2]
 md5=d44a81b9da9598425d9dd8dcd1cd5485
 sha256=427df09a88f9b4a38fbed68d8154090bf0c11fbdc132c26247dc5568ee5ae910
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfdesktop-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfdesktop-4.4.2.tar.bz2]
 md5=694601234e74903d0fccba064f411e0c
 sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
 
@@ -30578,19 +30582,19 @@ sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
 md5=ae15cacc3e3834cca7238a8e1035c50d
 sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfdesktop-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfdesktop-4.6.1.tar.bz2]
 md5=ae15cacc3e3834cca7238a8e1035c50d
 sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
 
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xffm-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xffm-4.2.0.tar.gz]
 md5=476b50335da473d46b12f43a07a28e83
 sha256=dcd12681eaaf2b88dd512023949080b6d47426ff855efc03329790ab479280c9
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xffm-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xffm-4.2.2.tar.gz]
 md5=5eb5ede5b2bfac564c26d96ee06a3241
 sha256=0cde8831dc56669a046f6284b0a8dabd583942837e41832e7ed57e57020c4446
 
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xffm-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xffm-4.2.3.tar.gz]
 md5=5d2a990bb725b6720db93f34dd91a731
 sha256=791a05a2fd695508ff6b3fd3e0e2be66de28a3d0bf86ee22e14126992d7aef21
 
@@ -30610,15 +30614,15 @@ sha256=7a66ba3910bd7e39d58f9d4a4a588f191a874b8607369fe2cc9203a7115006a9
 md5=d1df7b8622b7f8ebca4b2463118d7073
 sha256=b87b5f171cb4d61e35ff0fda9231166c4b6132fe512b05e8ff63a91be47eab43
 
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfprint-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfprint-4.2.0.tar.gz]
 md5=dce7378c3961122ca20b2518e939e57c
 sha256=6d643173a9ae18e1daa3566503bc461e9a056470595ec059b2eea70e4113b77b
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfprint-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfprint-4.3.99.2.tar.bz2]
 md5=c2eb9dee0002e875b91e73557f7354a1
 sha256=4eee12555dbc296fa26afbfdbfabad3586000239d5666e54b6bfae7f8cd03e89
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfprint-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfprint-4.4.2.tar.bz2]
 md5=be4802807e74dea30f4825102ceff5c5
 sha256=b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54
 
@@ -30630,7 +30634,7 @@ sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
 md5=d92fca97a42816085080baf07a99a62e
 sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfprint-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfprint-4.6.1.tar.bz2]
 md5=d92fca97a42816085080baf07a99a62e
 sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
 
@@ -30682,23 +30686,23 @@ sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
 md5=632c7745f884dc5e6fd707a18971aca3
 sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
 
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfwm4-4.2.0.tar.gz]
 md5=da6d773f31ef91400174c2045f0f1a80
 sha256=4ba4bad5bf750045175dc6af58ec29d046c91fa30c3b769213ce69fc739c8046
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfwm4-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfwm4-4.2.2.tar.gz]
 md5=e4c91c59da7d1bdc6141cde3263ea6f9
 sha256=02ab845725c59d4a2b6299e8d576df542011d7775637676080e9d76f02aa63da
 
-[http://www.us.xfce.org/archive/xfce-4.2.3.2/src/xfwm4-4.2.3.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3.2/src/xfwm4-4.2.3.2.tar.gz]
 md5=d73e89c50179ccb438c076b3b71d59a4
 sha256=018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2]
 md5=3186d90ae752cce9687698c8bd6b26c3
 sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfwm4-4.4.2.tar.bz2]
 md5=21da77e50b07e72bba784bf3418ca067
 sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
 
@@ -30706,23 +30710,23 @@ sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
 md5=538ff2554a23bf877d336e573884da9a
 sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
 
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfwm4-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfwm4-4.6.1.tar.bz2]
 md5=538ff2554a23bf877d336e573884da9a
 sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
 
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-themes-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfwm4-themes-4.2.0.tar.gz]
 md5=a8d0676fbf9cd3b3514d76a39d4ecbe1
 sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4
 
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfwm4-themes-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfwm4-themes-4.2.2.tar.gz]
 md5=440977408bd1395f4464f18f01faf644
 sha256=b458f3d9dc1f6370ac596862e1ebcbc3e5227e58450ea9c1172d7de6534e34a1
 
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2]
 md5=a77e9e700de66d38b6c4850a18283fb1
 sha256=10b2f7ffbf309c12ec82b4bc28b35014cb223208d3003bab3765b70dea9d96bd
 
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-themes-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfwm4-themes-4.4.2.tar.bz2]
 md5=fbea3ef7eec87fd669958f9cf597bfb8
 sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
 
@@ -30730,7 +30734,7 @@ sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
 md5=4dc5cb29cbd40e3b9dece12a85e20854
 sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
 
-[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfwm4-themes-4.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.0/src/xfwm4-themes-4.6.0.tar.bz2]
 md5=4dc5cb29cbd40e3b9dece12a85e20854
 sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
 
@@ -32082,7 +32086,7 @@ sha256=2822148fdf6f2054b51c776db21f71e817761c225b370ab3f3ce7efe3711368f
 md5=1fa62e2309fa52e26a5594cc38911aee
 sha256=2822148fdf6f2054b51c776db21f71e817761c225b370ab3f3ce7efe3711368f
 
-[http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz]
+[ftp://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz]
 md5=8a4da4460386e324debe97f3b7fe4d96
 sha256=d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
 
diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb
index e658e3256f..e11686f12b 100644
--- a/recipes/blktool/blktool_4.bb
+++ b/recipes/blktool/blktool_4.bb
@@ -1,8 +1,11 @@
 DESCRIPTION = "Display or change block device settings"
 LICENSE = "GPLv2"
 
+DEPENDS = "glib-2.0"
+PR = "r1"
+
 SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}.orig"
 
-inherit autotools
\ No newline at end of file
+inherit pkgconfig autotools
diff --git a/recipes/dnsmasq/dnsmasq-dbus_2.47.bb b/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
index d03dbdb06e..9aefb95ada 100644
--- a/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
+++ b/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
@@ -2,6 +2,8 @@
 
 require dnsmasq.inc
 
+S = "${WORKDIR}/dnsmasq-${PV}"
+
 DEPENDS = "dbus"
 EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
 
diff --git a/recipes/dnsmasq/dnsmasq.inc b/recipes/dnsmasq/dnsmasq.inc
index a8b8d85c50..68c6337306 100644
--- a/recipes/dnsmasq/dnsmasq.inc
+++ b/recipes/dnsmasq/dnsmasq.inc
@@ -1,14 +1,13 @@
-SECTION = "console/network"
 DESCRIPTION = "Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server."
 HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SECTION = "console/network"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz \
+#at least versions 2.15 and prior are moved to the archive folder on the server
+SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(bb.data.getVar('PV',d,1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz \
            file://init \
            file://dnsmasq.conf"
 
-S = "${WORKDIR}/dnsmasq-${PV}"
-
 inherit update-rc.d
 
 INITSCRIPT_NAME = "dnsmasq"
diff --git a/recipes/dnsmasq/dnsmasq_2.11.bb b/recipes/dnsmasq/dnsmasq_2.11.bb
index 68fa543210..83aea1d299 100644
--- a/recipes/dnsmasq/dnsmasq_2.11.bb
+++ b/recipes/dnsmasq/dnsmasq_2.11.bb
@@ -1,5 +1 @@
 require dnsmasq.inc
-
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-${PV}.tar.gz \
-           file://init \
-           file://dnsmasq.conf"
diff --git a/recipes/efl1/ewl_svn.bb b/recipes/efl1/ewl_svn.bb
index a8e0bfaf8d..910831ac00 100644
--- a/recipes/efl1/ewl_svn.bb
+++ b/recipes/efl1/ewl_svn.bb
@@ -18,6 +18,10 @@ EXTRA_OECONF = "\
   --disable-opengl-glew \
 "
 
+do_configure_prepend() {
+	autopoint
+}
+
 # TODO package engines more granular
 PACKAGES += "${PN}-plugins ${PN}-engines"
 
diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc
index 0539a2d0c6..b0e79f96c4 100644
--- a/recipes/mozilla/firefox.inc
+++ b/recipes/mozilla/firefox.inc
@@ -1,4 +1,5 @@
 DESCRIPTION ?= "Browser made by mozilla"
+DEPENDS += "alsa-lib"
 SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/mozilla/firefox_1.0.7.bb b/recipes/mozilla/firefox_1.0.7.bb
index 1b091bef64..fc973e2f8e 100644
--- a/recipes/mozilla/firefox_1.0.7.bb
+++ b/recipes/mozilla/firefox_1.0.7.bb
@@ -1,6 +1,6 @@
 PR = "r2"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://firefox-cc-fix.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_2.0.0.3.bb b/recipes/mozilla/firefox_2.0.0.3.bb
index 72c42bc074..3208c74673 100644
--- a/recipes/mozilla/firefox_2.0.0.3.bb
+++ b/recipes/mozilla/firefox_2.0.0.3.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r3"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://jsautocfg.h \
diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb
index f3e52a0c3f..ee60fc026e 100644
--- a/recipes/mozilla/firefox_3.0.1.bb
+++ b/recipes/mozilla/firefox_3.0.1.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r9"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb
index 83836d9117..7cfebfc554 100644
--- a/recipes/mozilla/firefox_3.0.4.bb
+++ b/recipes/mozilla/firefox_3.0.4.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r1"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb
index fceed37542..541a542c92 100644
--- a/recipes/mozilla/firefox_3.0.8.bb
+++ b/recipes/mozilla/firefox_3.0.8.bb
@@ -5,7 +5,7 @@ PR = "r1"
 # /OE/angstrom-dev/cross/armv7a/lib/gcc/arm-angstrom-linux-gnueabi/4.3.1/../../../../arm-angstrom-linux-gnueabi/bin/ld: ERROR: mozilla-xremote-client.o: Conflicting definitions of wchar_t
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb
index 75f29408b8..f126f13763 100644
--- a/recipes/mozilla/firefox_3.5.2.bb
+++ b/recipes/mozilla/firefox_3.5.2.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r2"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb
index 48e2709855..37be0fb858 100644
--- a/recipes/mozilla/firefox_3.5.4.bb
+++ b/recipes/mozilla/firefox_3.5.4.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
 
 PR = "r1"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb
index 56d6525a0d..a440382d14 100644
--- a/recipes/mozilla/firefox_3.5.5.bb
+++ b/recipes/mozilla/firefox_3.5.5.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
 
 PR = "r2"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/omgps/omgps/gcc-4.4.patch b/recipes/omgps/omgps/gcc-4.4.patch
new file mode 100644
index 0000000000..3eae960424
--- /dev/null
+++ b/recipes/omgps/omgps/gcc-4.4.patch
@@ -0,0 +1,68 @@
+diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
+--- omgps.orig/src/include/map_repo.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/map_repo.h	2010-01-17 14:55:24.000000000 +0100
+@@ -3,6 +3,9 @@
+ 
+ #include <glib.h>
+ #include <gdk/gdk.h>
++// workaround Python.h unconditionally (re)defines _XOPEN_SOURCE and _POSIX_C_SOURCE
++#undef _XOPEN_SOURCE
++#undef _POSIX_C_SOURCE
+ #include <Python.h>
+ 
+ #define MAP_MAX_BG_COLORS	5
+diff -uNr omgps.orig/src/include/py_ext.h omgps/src/include/py_ext.h
+--- omgps.orig/src/include/py_ext.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/py_ext.h	2010-01-17 14:55:57.000000000 +0100
+@@ -4,8 +4,8 @@
+ void py_ext_init();
+ void py_ext_cleanup();
+ 
+-void inline py_ext_trylock();
+-void inline py_ext_lock();
+-void inline py_ext_unlock();
++void py_ext_trylock();
++void py_ext_lock();
++void py_ext_unlock();
+ 
+ #endif /* PY_EXT_H_ */
+diff -uNr omgps.orig/src/include/uart.h omgps/src/include/uart.h
+--- omgps.orig/src/include/uart.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/uart.h	2010-01-17 14:33:00.000000000 +0100
+@@ -12,9 +12,9 @@
+ extern void uart_cleanup();
+ extern void uart_close();
+ 
+-extern inline int read_with_timeout(U1 *buf, int len);
+-extern inline int write_with_timeout(U1 *buf, int len);
+-extern inline gboolean read_fixed_len(U1 *buf, int expected_len);
++extern int read_with_timeout(U1 *buf, int len);
++extern int write_with_timeout(U1 *buf, int len);
++extern gboolean read_fixed_len(U1 *buf, int expected_len);
+ 
+ extern int sysfs_get_gps_device_power();
+ extern gboolean gps_device_power_on();
+diff -uNr omgps.orig/src/py_ext.c omgps/src/py_ext.c
+--- omgps.orig/src/py_ext.c	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/py_ext.c	2010-01-17 14:56:46.000000000 +0100
+@@ -26,17 +26,17 @@
+ 		Py_Finalize();
+ }
+ 
+-void inline py_ext_trylock()
++void py_ext_trylock()
+ {
+ 	TRYLOCK_MUTEX(&lock);
+ }
+ 
+-void inline py_ext_lock()
++void py_ext_lock()
+ {
+ 	LOCK_MUTEX(&lock);
+ }
+ 
+-void inline py_ext_unlock()
++void py_ext_unlock()
+ {
+ 	UNLOCK_MUTEX(&lock);
+ }
diff --git a/recipes/omgps/omgps_svn.bb b/recipes/omgps/omgps_svn.bb
index e68a9a4a3d..d73ade1934 100644
--- a/recipes/omgps/omgps_svn.bb
+++ b/recipes/omgps/omgps_svn.bb
@@ -7,6 +7,7 @@ DEPENDS = "gtk+ python-pygobject dbus-glib"
 PV = "0.1+svnr${SRCPV}"
 PR = "r0"
 S = "${WORKDIR}/${PN}"
-SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http"
+SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http \
+           file://gcc-4.4.patch;patch=1"
 
 inherit autotools
diff --git a/recipes/scim/files/configure.patch b/recipes/scim/files/configure.patch
new file mode 100644
index 0000000000..ca4a19ff54
--- /dev/null
+++ b/recipes/scim/files/configure.patch
@@ -0,0 +1,45 @@
+upstream: not applicable upstream
+origin: unknown contributor, sorry I forgot your name, your work is highly appreciated
+
+--- scim-1.4.6/configure.ac.old	2007-05-26 19:08:41.000000000 +0200
++++ scim-1.4.6/configure.ac	2007-05-26 21:15:00.000000000 +0200
+@@ -112,20 +112,8 @@
+ AM_CONDITIONAL(HAVE_XSLTPROC, test x$XSLTPROC != xno)
+ AC_SUBST(XSLTPROC)
+
+-# Checks if docbook-style-xsl is available
+-AC_CHECK_FILE(
+- [/usr/share/sgml/docbook/xsl-stylesheets/html/tldp-html.xsl],
+- [DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/tldp-html.xsl],
+- [AC_CHECK_FILE(
+-  [/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl],
+-  [DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl],
+-   [AC_CHECK_FILE(
+-    [/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl],
+-    [DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl],
+-    [DOCBOOK_XSL=no]
+-    )]
+-  )]
+-)
++# Not needed
++DOCBOOK_XSL=no
+
+ AC_SUBST(DOCBOOK_XSL)
+
+@@ -156,16 +144,6 @@
+ AC_CHECK_SIZEOF(unsigned long long int)
+ AC_CHECK_HEADERS([stdint.h],[has_stdint=yes],[has_stdint=no])
+
+-if test x$ac_cv_sizeof_unsigned_short_int = x2 && test x$ac_cv_sizeof_char = x1 ; then
+-  :
+-else
+-  AC_MSG_ERROR([
+-*** SCIM requires
+-***      sizeof (unsigned short int)  == 2
+-***      sizeof (char)                == 1
+-*** You might want to consider using the GNU C compiler.
+-])
+-fi
+
+ if test x$ac_cv_sizeof_wchar_t = x0 ; then
+   AC_MSG_ERROR([
diff --git a/recipes/scim/files/gcc-4.4-const-char.dpatch b/recipes/scim/files/gcc-4.4-const-char.dpatch
new file mode 100644
index 0000000000..b53a7b4d9c
--- /dev/null
+++ b/recipes/scim/files/gcc-4.4-const-char.dpatch
@@ -0,0 +1,17 @@
+upstream: Laibsch will push upstream soon
+origin: the original patch was prepared by Jari Aalto <jari.aalto@cante.net> for the Debian distribution
+        http://bugs.debian.org/560486
+
+Index: scim-1.4.9/src/ltdl.cpp
+===================================================================
+--- scim-1.4.9.orig/src/ltdl.cpp	2010-01-17 02:39:44.000000000 +0100
++++ scim-1.4.9/src/ltdl.cpp	2010-01-17 02:39:54.000000000 +0100
+@@ -3361,7 +3361,7 @@
+ {
+   lt_dlhandle	handle		= 0;
+   char *	tmp		= 0;
+-  char *	ext		= 0;
++  const char *	ext		= 0;
+   size_t	len;
+   int		errors		= 0;
+
diff --git a/recipes/scim/scim_1.4.9.bb b/recipes/scim/scim_1.4.9.bb
new file mode 100644
index 0000000000..61802f1173
--- /dev/null
+++ b/recipes/scim/scim_1.4.9.bb
@@ -0,0 +1,65 @@
+DESCRIPTION = "Smart Common Input Method (SCIM) platform"
+HOMEPAGE = "http://www.scim-im.org"
+SECTION = "libs/inputmethod"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
+           file://gcc-4.4-const-char.dpatch;patch=1 \
+           file://configure.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --without-doxygen "
+LEAD_SONAME = "libscim-1.0.so"
+
+PDIR = "${PN}-1.0"
+
+do_configure_append () {
+	# Fix unset @ALL_LINGUAS@
+	#   Replace with a list of available translations in ${S}/po
+
+	cd ${S}/po
+	SEDR=`ls *.gmo -1 --color=none | sed 's/.gmo//' | tr '\n' ' '`
+	SEDL='@ALL_LINGUAS@'
+	sed -i "s/${SEDL}.*/${SEDR}/" Makefile.in.in
+	sed -i "s/${SEDL}.*/${SEDR}/" Makefile.in
+	sed -i "s/${SEDL}.*/${SEDR}/" Makefile
+
+	# Fix unset @INTLTOOL_LIBDIR@
+	#   Only needed for a check to see if charmap.alias is present,
+	#   not really needed, so we fail that test by having it look
+	#   in ${S}
+
+	cd ${S}
+	sed -i 's/@INTLTOOL_LIBDIR@/./' intltool-merge.in
+	sed -i 's/@INTLTOOL_LIBDIR@/./' intltool-merge
+
+	# Fix unset @GTK_LIBDIR@
+	#   This is the same as ${libdir} so we use that
+
+	cd ${S}/extras/gtk2_immodule
+	sed -i 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.in
+	sed -i 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.am
+}
+
+pkg_postinst_${PN} () {
+	# Update gtk2 immodules
+	#   Adds SCIM to the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_${PN} () {
+	# Update gtk2 immodules
+	#   Removes SCIM from the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+FILES_${PN}-dbg +=   "${libdir}/${PDIR}/.debug \
+                      ${libdir}/${PDIR}/1.4.0/*/.debug \
+		      ${libdir}/gtk-2.0/immodules/.debug"
+FILES_${PN} +=       "${libdir}/${PDIR}/scim-panel-gtk \
+                      ${libdir}/${PDIR}/scim-helper* \
+                      ${libdir}/${PDIR}/scim-launcher \
+		      ${libdir}/${PDIR}/1.4.0 \
+                      ${libdir}/gtk-2.0/immodules"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 13dd65a7ae..aedeb3bb1b 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r34"
+PR = "r35"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -265,4 +265,5 @@ RDEPENDS_${PN} += "\
 		qi \
 		qi-ubi \
 		wpa-gui \
+		gabriel \
 "
diff --git a/recipes/zip/zip.inc b/recipes/zip/zip.inc
index b1154251b6..0ac49139f4 100644
--- a/recipes/zip/zip.inc
+++ b/recipes/zip/zip.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Archiver for .zip files"
 SECTION = "console/utils"
 LICENSE = "Info-ZIP"
 
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC} ${LDFLAGS}' 'AS=${CC} -c' 'CPP=${CPP}' \
 		'CFLAGS=-I. -DUNIX ${CFLAGS} ${LDFLAGS}' 'LFLAGS1=${LDFLAGS}' 'INSTALL=install' \