merge of '0e517dabcd24598274e65b9a372217fa56ffe66a'

     and '560eb1fe854306a1781ae17f1c30c0271e110cfd'

66 files changed, 1842 insertions, 261 deletions

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index b86562890a..b256365175 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -3,14 +3,18 @@ RDEPENDS += "hicolor-icon-theme"
 
 # This could run on the host as icon cache files are architecture independent,
 # but there is no gtk-update-icon-cache built natively.
-gtk-icon-cache_postinst() {
+gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
         exit 1
 fi
+
+# Update the pixbuf loaders in case they haven't been registered yet
+gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+
 gtk-update-icon-cache -q /usr/share/icons/hicolor
 }
 
-gtk-icon-cache_postrm() {
+gtk_icon_cache_postrm() {
 gtk-update-icon-cache -q /usr/share/icons/hicolor
 }
 
@@ -29,13 +33,13 @@ python populate_packages_append () {
 		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
 		if not postinst:
 			postinst = '#!/bin/sh\n'
-		postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1)
+		postinst += bb.data.getVar('gtk_icon_cache_postinst', d, 1)
 		bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
 		postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
 		if not postrm:
 			postrm = '#!/bin/sh\n'
-		postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1)
+		postrm += bb.data.getVar('gtk_icon_cache_postrm', d, 1)
 		bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
 }
 
diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass
index 69c708c151..c05ede481f 100644
--- a/classes/oestats-client.bbclass
+++ b/classes/oestats-client.bbclass
@@ -5,7 +5,7 @@
 # To make use of this class, add to your local.conf:
 #
 # INHERIT += "oestats-client"
-# OESTATS_SERVER = "some.server.org:8000"
+# OESTATS_SERVER = "some.server.org"
 # OESTATS_BUILDER = "some_nickname"
 
 def oestats_setid(d, val):
@@ -44,7 +44,7 @@ def oestats_send(server, action, vars = {}, files = {}):
 
 	# build headers
 	headers = {
-		"User-agent": "oestats-client/0.1",
+		"User-agent": "oestats-client/0.3",
 		"Content-type": "multipart/form-data; boundary=%s" % bound,
 		"Content-length": str(len(body))}
 
@@ -64,7 +64,7 @@ def oestats_start(server, builder, d):
 	# send report
 	id = ""
 	try:
-		data = oestats_send(server, "/builds/start/", {
+		data = oestats_send(server, "/builds/", {
 			'builder': builder,
 			'revision': bb.data.getVar('METADATA_REVISION', d, True),
 			'machine': bb.data.getVar('MACHINE', d, True),
@@ -81,7 +81,7 @@ def oestats_start(server, builder, d):
 		bb.note("oestats: error starting build, disabling stats")
 	oestats_setid(d, id)
 
-def oestats_stop(server, d, status):
+def oestats_stop(server, d, failures):
 	import bb
 
 	# retrieve build id
@@ -89,8 +89,13 @@ def oestats_stop(server, d, status):
 	if not id: return
 
 	# send report
+	if failures > 0:
+		status = "Failed"
+	else:
+		status = "Succeeded"		      
+
 	try:
-		response = oestats_send(server, "/builds/stop/%s/" % id, {
+		response = oestats_send(server, "/builds/%s/" % id, {
 			'status': status,
 		})
 	except:
@@ -125,10 +130,12 @@ def oestats_task(server, d, task, status):
 	
 	# send report
 	try:
-		response = oestats_send(server, "/builds/task/%s/" % id, {
+		response = oestats_send(server, "/tasks/", {
+			'build': id,
 			'package': bb.data.getVar('PN', d, True),
 			'version': bb.data.getVar('PV', d, True),
 			'revision': bb.data.getVar('PR', d, True),
+			'depends': bb.data.getVar('DEPENDS', d, True),
 			'task': task,
 			'status': status,
 			'time': str(elapsed),
@@ -154,7 +161,7 @@ python oestats_eventhandler () {
 	if getName(e) == 'BuildStarted':
 		oestats_start(server, builder, e.data)
 	elif getName(e) == 'BuildCompleted':
-		oestats_stop(server, e.data, 'Completed')
+		oestats_stop(server, e.data, e.getFailures())
 	elif getName(e) == 'TaskStarted':
 		bb.data.setVar('OESTATS_STAMP', repr(time.time()), e.data)
 	elif getName(e) == 'TaskSucceeded':
diff --git a/packages/acpid/acpid_1.0.6.bb b/packages/acpid/acpid_1.0.6.bb
new file mode 100644
index 0000000000..f48c262254
--- /dev/null
+++ b/packages/acpid/acpid_1.0.6.bb
@@ -0,0 +1,4 @@
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"
+PR = "r3"
+
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index 7051966ffc..dae3b04999 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
            file://CURRENTCFG.MK \
            file://c64xx_5.xx_linux.mk \
            file://davinci_mvlpro5.0.mk \
-	   file://prcs-fix-include.patch;patch=1 \
+	   file://prcs-fix-include.patch;patch=1;pnum=2 \
 "
 
 S = "${WORKDIR}/dsplink_1_50/dsplink"
diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb
index 9da21d32f6..f21ba5075a 100644
--- a/packages/efl1/ecore-native_cvs.bb
+++ b/packages/efl1/ecore-native_cvs.bb
@@ -1,7 +1,7 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-PR = "r4"
+PR = "r0"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 140254f897..a0d040888d 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "curl eet evas tslib libxtst libxscrnsaver"
 # optional
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
-PV = "0.9.9.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
 
 inherit efl
 
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index 3f1c970b3d..e2ded16111 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-PR = "r3"
+PR = "r0"
 
 EXTRA_OECONF = "\
         --x-includes=${STAGING_INCDIR}/X11 \
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index 8b3731412f..9158590b03 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Edb is the Enlightenment database library"
 LICENSE = "MIT BSD"
 DEPENDS = "zlib"
-PV = "1.0.5.042+cvs${SRCDATE}"
+PV = "1.0.5.043+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index 812da033ec..e59ba0be1a 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore efreet ewl"
 LICENSE = "MIT BSD"
-PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r5"
+PV = "0.5.0.043+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index 5e78575efa..757b643e75 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
-PV = "0.5.0.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index c834cfa60a..9ed58e100a 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "zlib jpeg"
 LICENSE = "MIT BSD"
-PV = "0.9.10.042+cvs${SRCDATE}"
+PV = "1.0.1+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index 3087391312..36a3bdf3cf 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
 LICENSE = "MIT BSD"
-PV = "0.0.3.042+cvs${SRCDATE}"
+PV = "0.5.0.043+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index f6ae8abe71..02385e9ec7 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
-PV = "0.9.1.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index 6cdae5754d..5a363655c3 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
-PV = "0.9.0.042+cvs${SRCDATE}"
+PV = "0.9.0.043+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb
index 3ca8df9e41..b2a235262d 100644
--- a/packages/efl1/evas-native_cvs.bb
+++ b/packages/efl1/evas-native_cvs.bb
@@ -1,7 +1,7 @@
 require evas.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PR = "r1"
+PR = "r0"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 8cfeffbf0b..10dd8ad529 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Evas is the Enlightenment canvas API"
 LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
 DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
-PV = "0.9.9.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
 
 inherit efl
 
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index e7079615de..ebe604ec2b 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r1"
+PR = "r0"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 013f2666cb..ee5b3cfd23 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-cargs6.patch;patch=1 \
            file://eglibc-svn-arm-check_pf.patch;patch=1 \
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index bd1cb4f4e4..43a64d8af1 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -79,9 +79,6 @@ do_install() {
 		mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
 	done
 	rm -f ${D}/etc/rpc
-	rm -f ${D}${includedir}/scsi/sg.h
-	rm -f ${D}${includedir}/scsi/scsi_ioctl.h
-	rm -f ${D}${includedir}/scsi/scsi.h
 }
 
 TMP_LOCALE="/tmp/locale${libdir}/locale"
@@ -250,6 +247,9 @@ python package_do_split_gconvs () {
 
 	def output_locale_binary(name, locale, encoding):
 		target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+		if target_arch in ("i586", "i686"):
+		   target_arch = "i386"
+
 		qemu = "qemu-%s -r 2.6.16" % target_arch
 		pkgname = 'locale-base-' + legitimize_package_name(name)
 		m = re.match("(.*)\.(.*)", name)
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index bf4a4092fc..4a94dac5b7 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 04d5b415bf..c40968dd7f 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r24"
+PR = "r25"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 7289e0985a..6ea2951eb6 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 6bc6ccc0b1..9c344ccc46 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r9"
+PR = "r10"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 5e4ee1ef66..51de036ece 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r9"
+PR = "r10"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 0b8376349e..6fb4b12293 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r7"
+PR = "r8"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 6421e6c966..b1eeef30f0 100644
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/