merge of bdbeb53fb07854a8484b17504b9ab11113e0fe51

     and fda50be34c5e8aeb2a40fcb38520b83eea2db043

98 files changed, 1646 insertions, 245 deletions

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index ff6929d757..16c2dba0b8 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -69,8 +69,8 @@ do_stage_append () {
 }
 
 PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples"
-FILES_${SRCNAME} = "${libdir}"
+FILES_${SRCNAME} = "${libdir}/lib*.so*"
 FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles"
-FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include"
+FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include"
 FILES_${SRCNAME}-examples = "${bindir} ${datadir}"
 
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 8b2186dec6..ff9aeeab78 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -193,6 +193,7 @@ module_autoload_rfcomm = "rfcomm"
 module_autoload_sa1100-rtc = "sa1100-rtc"
 
 # alias defaults (alphabetically sorted)
+module_conf_af_packet = "alias net-pf-17 af_packet"
 module_conf_bluez = "alias net-pf-31 bluez"
 module_conf_bnep = "alias bt-proto-4 bnep"
 module_conf_hci_uart = "alias tty-ldisc-15 hci_uart"
@@ -229,7 +230,7 @@ python populate_packages_prepend () {
 
 		kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1)
 		kernelver_stripped = kernelver
-		m = re.match('^(.*-hh.*)\..*$', kernelver)
+		m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
 		if m:
 			kernelver_stripped = m.group(1)
 		path = bb.data.getVar("PATH", d, 1)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a6a137d4de..04603d393d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,7 +319,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
 # Program to be used to patch sources, use 'inherit patcher' to overwrite this:
 
 PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
-PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
+PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
 PATCH_DEPENDS = "quilt-native"
 
 # GNU patch tries to be intellgent about checking out read-only files from
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 502e3594fd..484dd4966c 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -25,7 +25,7 @@ PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.103"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
 PREFERRED_VERSION_libgpevtype ?= "0.12"
-PREFERRED_VERSION_libschedule ?= "0.14"
+PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_gpe-icons ?= "0.24"
 PREFERRED_VERSION_libgsm ?= "1.0.10"
 PREFERRED_VERSION_diet-x11 ?= "6.2.1"
@@ -42,7 +42,7 @@ PREFERRED_VERSION_gpe-login ?= "0.81"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.63"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.54"
-PREFERRED_VERSION_gpe-calendar ?= "0.61"
+PREFERRED_VERSION_gpe-calendar ?= "0.63"
 PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
 PREFERRED_VERSION_gpe-contacts ?= "0.41"
 PREFERRED_VERSION_gpe-today ?= "0.08"
@@ -51,7 +51,7 @@ PREFERRED_VERSION_dbus ?= "0.23.4"
 PREFERRED_VERSION_gpe-bluetooth ?= "0.42"
 PREFERRED_VERSION_gpe-su ?= "0.18"
 PREFERRED_VERSION_gpe-conf ?= "0.1.25"
-PREFERRED_VERSION_gpe-clock ?= "0.20"
+PREFERRED_VERSION_gpe-clock ?= "0.21"
 PREFERRED_VERSION_gpe-mininet ?= "0.5"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
 PREFERRED_VERSION_gpe-shield ?= "0.7"
@@ -63,7 +63,7 @@ PREFERRED_VERSION_xmonobut ?= "0.4"
 PREFERRED_VERSION_gpe-edit ?= "0.29"
 PREFERRED_VERSION_gpe-gallery ?= "0.96"
 PREFERRED_VERSION_gpe-calculator ?= "0.2"
-PREFERRED_VERSION_gpe-package ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.3"
 PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
 PREFERRED_VERSION_gpe-terminal ?= "1.1"
 PREFERRED_VERSION_gpe-watch ?= "0.10"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 6474b7695d..bf07d6b1f0 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -20,8 +20,6 @@ DISTRO_VERSION = "3.1 compatible"
 DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"
 
-CVSDATE = "20050221"
-
 #
 # Zaurus
 #
@@ -41,7 +39,7 @@ ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils vi
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial
 ASSUME_PROVIDED += "virtual/libc linux-libc-headers"
 
-DEPENDS_autoconf-native =+ "sharprom-toolchain"
+DEPENDS =+ "sharprom-toolchain-native"
 
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 
diff --git a/conf/distro/unslung-binary-kernel-packages.conf b/conf/distro/unslung-binary-kernel-packages.conf
index 3e9059fae8..1dd405bd6e 100644
--- a/conf/distro/unslung-binary-kernel-packages.conf
+++ b/conf/distro/unslung-binary-kernel-packages.conf
@@ -34,5 +34,6 @@ ${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
+${PKGDIR}/packages/zd1211/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
 ${UNSLUNG_EXTRA_BBFILES}"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 9e91dcfbbc..0363bd2f01 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -8,7 +8,7 @@ KERNEL ?= "kernel24"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ipaqpxa h3900"
+IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf
index 4e62a749dc..563586c902 100644
--- a/conf/machine/tune-arm926ejs.conf
+++ b/conf/machine/tune-arm926ejs.conf
@@ -1,2 +1,2 @@
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
 PACKAGE_ARCH = "armv5te"
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
new file mode 100644
index 0000000000..aa97a9f4de
--- /dev/null
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -0,0 +1,15 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "x11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb
index 87fea43d20..1f3db9ddfe 100644
--- a/packages/efl/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.013.bb
@@ -1,6 +1,5 @@
 include ecore.inc
-PROVIDES += "virtual/ecore"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-job \
@@ -16,6 +15,8 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-ipc \
 		--enable-ecore-txt \
 		--disable-ecore-x \
+		--disable-curl \
+		--without-curl-config \
 		--enable-ecore-config \
 		--disable-openssl"
 
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 6968415d34..abfb41d63b 100644
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -1,3 +1,5 @@
 include ecore-fb_${PV}.bb
 inherit native
-DEPENDS = "curl-native eet-native evas-native"
+# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
+# DEPENDS = "curl-native eet-native evas-native"
+DEPENDS = "eet-native evas-native"
diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb
index 36a9c06413..b6b452cb71 100644
--- a/packages/efl/ecore-x11_0.9.9.013.bb
+++ b/