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

47 files changed, 309 insertions, 122 deletions

diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb
index 09cf22b3c8..9bb22e2aa7 100644
--- a/recipes/alsa/alsa-state.bb
+++ b/recipes/alsa/alsa-state.bb
@@ -7,7 +7,7 @@
 DESCRIPTION = "Alsa Scenario Files"
 LICENSE = "MIT"
 PV = "0.2.0"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "\
   file://asound.conf \
@@ -22,7 +22,7 @@ SRC_URI_append_a780 = "file://gsmhandset.state \
 inherit update-rc.d
 
 INITSCRIPT_NAME = "alsa-state"
-INITSCRIPT_PARAMS = "start 39 S ."
+INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ."
 
 do_install() {
     install -d ${D}${sysconfdir}/init.d
diff --git a/recipes/eel/eel_2.12.2.bb b/recipes/eel/eel_2.12.2.bb
index 92bfc88f46..88682b5b35 100644
--- a/recipes/eel/eel_2.12.2.bb
+++ b/recipes/eel/eel_2.12.2.bb
@@ -3,11 +3,12 @@
 # Released under the MIT license (see packages/COPYING)
 
 inherit gnome
+PR = "r2"
 
 LICENSE="GPL"
 SRC_URI += "file://configure.patch;patch=1"
 
-DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 
diff --git a/recipes/eel/eel_2.22.2.bb b/recipes/eel/eel_2.22.2.bb
index 04353795c3..0c7a6de42c 100644
--- a/recipes/eel/eel_2.22.2.bb
+++ b/recipes/eel/eel_2.22.2.bb
@@ -3,12 +3,13 @@
 # Released under the MIT license (see packages/COPYING)
 
 inherit gnome
+PR = "r2"
 
 LICENSE="GPL"
 
 SRC_URI += "file://eel-no-strftime.patch;patch=1"
 
-DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
diff --git a/recipes/eel/eel_2.24.1.bb b/recipes/eel/eel_2.24.1.bb
index 04353795c3..0c7a6de42c 100644
--- a/recipes/eel/eel_2.24.1.bb
+++ b/recipes/eel/eel_2.24.1.bb
@@ -3,12 +3,13 @@
 # Released under the MIT license (see packages/COPYING)
 
 inherit gnome
+PR = "r2"
 
 LICENSE="GPL"
 
 SRC_URI += "file://eel-no-strftime.patch;patch=1"
 
-DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
diff --git a/recipes/eel/eel_2.6.1.bb b/recipes/eel/eel_2.6.1.bb
index f123a4aa93..d93aab1e61 100644
--- a/recipes/eel/eel_2.6.1.bb
+++ b/recipes/eel/eel_2.6.1.bb
@@ -3,11 +3,12 @@
 # Released under the MIT license (see packages/COPYING)
 
 inherit gnome
+PR = "r2"
 
 LICENSE="GPL"
 SRC_URI += "file://configure.patch;patch=1"
 
-DEPENDS="libgnomeui gail"
+DEPENDS="libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 edir="${STAGING_INCDIR}/eel-2/eel"
diff --git a/recipes/esekeyd/esekeyd_1.2.4.bb b/recipes/esekeyd/esekeyd_1.2.4.bb
new file mode 100644
index 0000000000..5a9deb6c55
--- /dev/null
+++ b/recipes/esekeyd/esekeyd_1.2.4.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "ESE Key Daemon"
+LICENSE = "GPL"
+SECTION = "base"
+HOMEPAGE = "http://www.burghardt.pl"
+
+SRC_URI = "http://www.burghardt.pl/files/esekeyd-${PV}.tar.gz"
+
+inherit autotools 
+
diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc
index e12f93c800..5cf2687873 100644
--- a/recipes/gcc/gcc-4.1.0.inc
+++ b/recipes/gcc/gcc-4.1.0.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc
index ac8a4a8a71..22c20ce9a2 100644
--- a/recipes/gcc/gcc-4.1.1.inc
+++ b/recipes/gcc/gcc-4.1.1.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://110-arm-eabi.patch;patch=1 \
 	file://200-uclibc-locale.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
index 614e2bb421..7ffb9ce738 100644
--- a/recipes/gcc/gcc-4.1.2.inc
+++ b/recipes/gcc/gcc-4.1.2.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://110-arm-eabi.patch;patch=1 \
 	file://200-uclibc-locale.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc
index 16e5b8f5bc..920805bedc 100644
--- a/recipes/gcc/gcc-4.2.1.inc
+++ b/recipes/gcc/gcc-4.2.1.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
 	file://200-uclibc-locale.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc
index 0f4de3cdc7..f5878123ed 100644
--- a/recipes/gcc/gcc-4.2.2.inc
+++ b/recipes/gcc/gcc-4.2.2.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
 	file://200-uclibc-locale.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc
index 7726030f20..35d8cc6f1b 100644
--- a/recipes/gcc/gcc-4.2.3.inc
+++ b/recipes/gcc/gcc-4.2.3.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
 	file://200-uclibc-locale.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
index b21569b270..085f241558 100644
--- a/recipes/gcc/gcc-4.2.4.inc
+++ b/recipes/gcc/gcc-4.2.4.inc
@@ -2,7 +2,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
 	file://200-uclibc-locale.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc
index cdab6dc215..132bbe788d 100644
--- a/recipes/gcc/gcc-4.3.1.inc
+++ b/recipes/gcc/gcc-4.3.1.inc
@@ -6,7 +6,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc
index aeb3477e3b..e053ba2231 100644
--- a/recipes/gcc/gcc-4.3.2.inc
+++ b/recipes/gcc/gcc-4.3.2.inc
@@ -6,7 +6,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 4bed0e4740..860c96cadb 100644
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -6,7 +6,7 @@ require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
 
-SRC_URI = "http://gcc.releasenotes.org/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
diff --git a/recipes/gnome/gail_1.20.0.bb b/recipes/gnome/gail_1.20.0.bb
index 58168a04d5..13346f34b0 100644
--- a/recipes/gnome/gail_1.20.0.bb
+++ b/recipes/gnome/gail_1.20.0.bb
@@ -3,6 +3,7 @@ SECTION = "x11/libs"
 PR = "r0"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
 DEPENDS = "gtk+"
+PROVIDES = "virtual/gail"
 
 inherit gnome
 
diff --git a/recipes/gnome/gnome-keyring_2.24.1.bb b/recipes/gnome/gnome-keyring_2.24.1.bb
index 105ee16d11..9d2b5234a5 100644
--- a/recipes/gnome/gnome-keyring_2.24.1.bb
+++ b/recipes/gnome/gnome-keyring_2.24.1.bb
@@ -3,7 +3,9 @@ SECTION = "x11/gnome"
 
 inherit autotools gnome pkgconfig
 
-DEPENDS = "gtk+ libtasn1 libgcrypt"
+PR = "r1"
+
+DEPENDS = "gtk+ libtasn1 libgcrypt gconf"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomecanvas_2.20.0.bb b/recipes/gnome/libgnomecanvas_2.20.0.bb
index 8e13c9562b..16391cb6f4 100644
--- a/recipes/gnome/libgnomecanvas_2.20.0.bb
+++ b/recipes/gnome/libgnomecanvas_2.20.0.bb
@@ -1,10 +1,11 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 DESCRIPTION = "A powerful object-oriented display"
+PR = "r2"
 
 inherit gnome
 
-DEPENDS = "libglade libart-lgpl gail"
+DEPENDS = "libglade libart-lgpl virtual/gail"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index e17a91dcc4..c0b9ed5c80 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -44,6 +44,9 @@ do_stage () {
 	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
 	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
 	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+	if test -d modules/other/gail/libgail-util ; then
+		oe_libinstall -so -C modules/other/gail/libgail-util libgailutil ${STAGING_LIBDIR}
+	fi
 
 	autotools_stage_includes
 
diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb
index 259c0ac672..eb6cc536b9 100644
--- a/recipes/gtk+/gtk+_2.14.2.bb
+++ b/recipes/gtk+/gtk+_2.14.2.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS += "cairo jasper"
 
@@ -39,6 +39,8 @@ python populate_packages_prepend () {
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
 
+# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23):
+PROVIDES = "virtual/gail"
 RPROVIDES_${PN} = "libgailutil18"
 RCONFLICTS_${PN} = "libgailutil18"
 RREPLACES_${PN} = "libgailutil18"
diff --git a/recipes/gtk+/gtk+_2.16.0.bb b/recipes/gtk+/gtk+_2.16.0.bb
index b5f7c71afb..0b4e24eea7 100644
--- a/recipes/gtk+/gtk+_2.16.0.bb
+++ b/recipes/gtk+/gtk+_2.16.0.bb
@@ -1,7 +1,7 @@
 require gtk+.inc
 
 DEPENDS += "cairo jasper"
-PR = "r1"
+PR = "r2"
 
 # disabled per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
@@ -40,6 +40,8 @@ python populate_packages_prepend () {
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
 
+# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23):
+PROVIDES = "virtual/gail"
 RPROVIDES_${PN} = "libgailutil18"
 RCONFLICTS_${PN} = "libgailutil18"
 RREPLACES_${PN} = "libgailutil18"
diff --git a/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb b/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb
index f44e8b57a6..21d1a6bab6 100644
--- a/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb
+++ b/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb
@@ -1,7 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-PR = "r0"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
+PR = "r1"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz"
 
diff --git a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
index 66993cec74..c45b9f7ade 100644
--- a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
+++ b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
@@ -1,7 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-PR = "r2"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
+PR = "r3"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
 	file://fix-missing-colormap.patch;patch=1"
diff --git a/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb b/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb
index 1e389dabe0..18d77d8e49 100644
--- a/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb
+++ b/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb
@@ -1,6 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.1"
diff --git a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
index cb2b8b2acc..e63bc4c72e 100644
--- a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
+++ b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
@@ -1,6 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \
 	file://cross-includedir.patch;patch=1"
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
index e8727bd0dc..6a48e837a6 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "HTML rendering/editing library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \
            file://60_glib-2.15-g-gnuc-function.patch;patch=1"
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb b/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb
index e678bc3134..6b8bffdf94 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb
@@ -1,6 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.18/gtkhtml-${PV}.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.8"
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb b/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb
index cc177de08f..204d925e3a 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb
@@ -1,6 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.8"
diff --git a/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
index 44a96d6d64..cec898e7eb 100644
--- a/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
+++ b/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
@@ -1,7 +1,7 @@
 require gtkhtml.inc
 
-DEPENDS = "gtk+ gail libgnomeprint orbit2-native"
-PR = "r1"
+DEPENDS = "gtk+ virtual/gail libgnomeprint orbit2-native"
+PR = "r2"
 
 SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
index 2292ae23b4..a86cd5bed8 100644
--- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-omap1
-# Tue Mar 24 13:33:16 2009
+# Thu Apr  2 20:45:56 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -77,7 +77,7 @@ CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
@@ -288,7 +288,7 @@ CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
 CONFIG_LEDS=y
-CONFIG_ALIGNMENT_TRAP=n
+CONFIG_ALIGNMENT_TRAP=y
 
 #
 # Boot options
@@ -492,7 +492,8 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_WIMAX is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -733,7 +734,9 @@ CONFIG_P54_USB=y
 CONFIG_HOSTAP=y
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-# CONFIG_B43 is not set
+CONFIG_B43=y
+CONFIG_B43_LEDS=y
+# CONFIG_B43_DEBUG is not set
 # CONFIG_B43LEGACY is not set
 CONFIG_ZD1211RW=y
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -748,27 +751,29 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 
 #
-# Enable WiMAX (Networking options) to see the WiMAX drivers
+# WiMAX Wireless Broadband devices
 #
+# CONFIG_WIMAX_I2400M_USB is not set
+# CONFIG_WIMAX_I2400M_SDIO is not set
 
 #
 # USB Network Adapters
 #
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
+CONFIG_USB_CATC=y
+CONFIG_USB_KAWETH=y
+CONFIG_USB_PEGASUS=y
+CONFIG_USB_RTL8150=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
-CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC95XX is not set
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_DM9601=y
+CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_NET_GL620A=y
+CONFIG_USB_NET_NET1080=y
+CONFIG_USB_NET_PLUSB=y
 CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_RNDIS_HOST=y
-CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_CDC_SUBSET=y
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_AN2720=y
 CONFIG_USB_BELKIN=y
@@ -798,7 +803,7 @@ CONFIG_SLHC=m
 # Input device support
 #
 CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=y
 # CONFIG_INPUT_POLLDEV is not set
 
 #
@@ -841,7 +846,15 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_TWL4030_PWRBUTTON=y
+CONFIG_INPUT_UINPUT=y
 
 #
 # Hardware I/O ports
@@ -1066,7 +1079,9 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Sonics Silicon Backplane
 #
-# CONFIG_SSB is not set
+CONFIG_SSB=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
 
 #
 # Multifunction device drivers
@@ -1148,13 +1163,13 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
 CONFIG_USB_M5602=m
-# CONFIG_USB_STV06XX is not set
+CONFIG_USB_STV06XX=m
 CONFIG_USB_GSPCA_CONEX=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_OV519=m
-# CONFIG_USB_GSPCA_OV534 is not set
+CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7311=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -1269,10 +1284,10 @@ CONFIG_DVB_STB6000=m
 CONFIG_DVB_STV0299=m
 CONFIG_DVB_TDA8083=m
 CONFIG_DVB_TDA10086=m
-# CONFIG_DVB_TDA8261 is not set
+CONFIG_DVB_TDA8261=m
 CONFIG_DVB_VES1X93=m
 CONFIG_DVB_TUNER_ITD1000=m
-# CONFIG_DVB_TUNER_CX24113 is not set