merge of '3948c8054b50f67afee06a66abbab4a35915d297'

     and 'cefef520b1840df3899cd9fc5a4fc3cb9faa38ce'

72 files changed, 15305 insertions, 290 deletions

diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb
index abdc188ecf..48b8412088 100644
--- a/packages/apex/apex-nslu2-16mb_1.5.8.bb
+++ b/packages/apex/apex-nslu2-16mb_1.5.8.bb
@@ -3,10 +3,7 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
-
-# Note that this recipe only works for the NSLU2 at the moment.
-# Patches to make it more generic are welcome.
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig-16mb"
@@ -14,11 +11,7 @@ S = ${WORKDIR}/apex-${PV}
 
 CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
 
-CMDLINE_ROOT         = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
-
-CMDLINE_ROOT_nslu2   = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_ROOT  ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
 
 CMDLINE_DEBUG ?= ""
 
@@ -44,7 +37,6 @@ do_configure() {
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
 		${WORKDIR}/defconfig-16mb > ${S}/.config
@@ -60,10 +52,8 @@ do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
 	. ${CONFIG_SITE}
 	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4'
 	else
 		oefatal do_populate_staging cannot determine endianess
diff --git a/packages/apex/apex-nslu2_1.5.8.bb b/packages/apex/apex-nslu2_1.5.8.bb
index 6c2b7ccd63..8444d19472 100644
--- a/packages/apex/apex-nslu2_1.5.8.bb
+++ b/packages/apex/apex-nslu2_1.5.8.bb
@@ -3,10 +3,7 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
-
-# Note that this recipe only works for the NSLU2 at the moment.
-# Patches to make it more generic are welcome.
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
@@ -14,11 +11,7 @@ S = ${WORKDIR}/apex-${PV}
 
 CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
 
-CMDLINE_ROOT         = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
-
-CMDLINE_ROOT_nslu2   = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_ROOT  ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
 
 CMDLINE_DEBUG ?= ""
 
@@ -44,7 +37,6 @@ do_configure() {
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
@@ -60,10 +52,8 @@ do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
 	. ${CONFIG_SITE}
 	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4'
 	else
 		oefatal do_populate_staging cannot determine endianess
diff --git a/packages/apex/nslu2/.mtn2git_empty b/packages/apex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/apex/nslu2/.mtn2git_empty
+++ b/packages/apex/files/.mtn2git_empty
diff --git a/packages/apex/nslu2/defconfig b/packages/apex/files/defconfig
index 3c8522e2e8..3c8522e2e8 100644
--- a/packages/apex/nslu2/defconfig
+++ b/packages/apex/files/defconfig
diff --git a/packages/apex/nslu2/defconfig-16mb b/packages/apex/files/defconfig-16mb
index c9688e3d75..c9688e3d75 100644
--- a/packages/apex/nslu2/defconfig-16mb
+++ b/packages/apex/files/defconfig-16mb
diff --git a/packages/gcc/gcc-4.2.1/pr34130.patch b/packages/gcc/gcc-4.2.1/pr34130.patch
new file mode 100644
index 0000000000..415335f4b4
--- /dev/null
+++ b/packages/gcc/gcc-4.2.1/pr34130.patch
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+             }
+           break;
+         }
+-      /* FALLTHROUGH */
++   /* If the constant is negative, we cannot simplify this.  */
++   if (tree_int_cst_sgn (c) == -1)
++     break;
++   /* FALLTHROUGH */
+     case NEGATE_EXPR:
+       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
diff --git a/packages/gcc/gcc-4.2.2/pr34130.patch b/packages/gcc/gcc-4.2.2/pr34130.patch
new file mode 100644
index 0000000000..415335f4b4
--- /dev/null
+++ b/packages/gcc/gcc-4.2.2/pr34130.patch
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+             }
+           break;
+         }
+-      /* FALLTHROUGH */
++   /* If the constant is negative, we cannot simplify this.  */
++   if (tree_int_cst_sgn (c) == -1)
++     break;
++   /* FALLTHROUGH */
+     case NEGATE_EXPR:
+       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
diff --git a/packages/gpephone/contact_svn.bb b/packages/gpephone/contact_svn.bb
new file mode 100644
index 0000000000..0b785ac9f0
--- /dev/null
+++ b/packages/gpephone/contact_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "G(PE)^2 address book v2"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
+PV = "0.0+svn-${SRCREV}"
+PR = "r0"
+
+inherit gpephone autotools
+
+SRC_URI = ${GPEPHONE_SVN}
+
+S = "${WORKDIR}/contact/trunk"
+
+
+FILES_${PN} += "${datadir}"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/libabenabler2/.mtn2git_empty b/packages/gpephone/libabenabler2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libabenabler2/.mtn2git_empty
diff --git a/packages/gpephone/libabenabler2/i18n.patch b/packages/gpephone/libabenabler2/i18n.patch
new file mode 100644
index 0000000000..3b5354380f
--- /dev/null
+++ b/packages/gpephone/libabenabler2/i18n.patch
@@ -0,0 +1,18 @@
+--- libabenabler2-1.0/Makefile.am~	2007-11-27 16:51:42.000000000 +0100
++++ libabenabler2-1.0/Makefile.am	2007-11-27 16:51:42.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS	= src include plugins test 
++SUBDIRS	= src include plugins test po
+ 
+ EXTRA_DIST			= libabenabler2.pc.in
+ 
+--- libabenabler2-1.0/configure.ac~	2007-11-27 16:51:18.000000000 +0100
++++ libabenabler2-1.0/configure.ac	2007-11-27 16:51:18.000000000 +0100
+@@ -31,6 +31,7 @@
+ plugins/Makefile
+ test/Makefile
+ libabenabler2.pc
++po/Makefile.in
+ ])
+ AC_OUTPUT
+ 
diff --git a/packages/gpephone/libabenabler2_1.0.bb b/packages/gpephone/libabenabler2_1.0.bb
index 9277d9359a..ce8470274d 100644
--- a/packages/gpephone/libabenabler2_1.0.bb
+++ b/packages/gpephone/libabenabler2_1.0.bb
@@ -3,12 +3,20 @@ DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord2 gconf sqlite3"
-PR          = "r0"
+PR          = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-LDFLAGS += " -L${STAGING_LIBDIR}"
+SRC_URI += "file://i18n.patch;patch=1"
+
+FILES_${PN} += "${datadir}/contact ${libdir}/lips/*.so"
+FILES_${PN}-dbg += "${libdir}/lips/.debug/*.so"
+
+do_configure_prepend () {
+        mkdir "${S}/po"
+        touch "${S}/po/POTFILES.in"
+}
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/gpephone/libabenabler2_svn.bb b/packages/gpephone/libabenabler2_svn.bb
new file mode 100644
index 0000000000..ea070092a2
--- /dev/null
+++ b/packages/gpephone/libabenabler2_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "LiPS address book library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
+PV = "0.0+svn-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+        autotools_stage_all
+}
+
+DEFAULT_PREFERENCE = "-1"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
diff --git a/packages/gpephone/libcalenabler2_svn.bb b/packages/gpephone/libcalenabler2_svn.bb
new file mode 100644
index 0000000000..6144e055de
--- /dev/null
+++ b/packages/gpephone/libcalenabler2_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "LiPS calendar API."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 sqlite3 libical"
+PV = "0.0+svn-${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+    autotools_stage_all
+}
+
+FILES_${PN} += " ${libdir}/*.so.*"
+FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
+FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/libiac-0.1/.mtn2git_empty b/packages/gpephone/libiac-0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libiac-0.1/.mtn2git_empty
diff --git a/packages/gpephone/libiac-0.1/po.patch b/packages/gpephone/libiac-0.1/po.patch
new file mode 100644
index 0000000000..efc981ce16
--- /dev/null
+++ b/packages/gpephone/libiac-0.1/po.patch
@@ -0,0 +1,17 @@
+--- libiac-0.1/Makefile.am~	2007-11-07 22:33:46.000000000 +0100
++++ libiac-0.1/Makefile.am	2007-11-07 22:33:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS=src 
++SUBDIRS = src po
+ 
+ EXTRA_DIST = libiac.pc.in
+ 
+--- libiac-0.1/configure.ac~	2007-11-07 22:34:12.000000000 +0100
++++ libiac-0.1/configure.ac	2007-11-07 22:34:12.000000000 +0100
+@@ -22,5 +22,5 @@
+ 

+ PKG_CHECK_MODULES(IAC, glib-2.0 dbus-1 dbus-glib-1)

+ 

+-AC_CONFIG_FILES([Makefile src/Makefile libiac.pc ])

++AC_CONFIG_FILES([Makefile src/Makefile libiac.pc po/Makefile.in])

+ AC_OUTPUT

diff --git a/packages/gpephone/libiac_0.1.bb b/packages/gpephone/libiac_0.1.bb
index 940b1ecc31..5d522b7f54 100644
--- a/packages/gpephone/libiac_0.1.bb
+++ b/packages/gpephone/libiac_0.1.bb
@@ -3,11 +3,13 @@ DESCRIPTION = "LiPS IPC library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ gtk-doc"
-PR          = "r1"
+PR          = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
+SRC_URI += "file://po.patch;patch=1"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/gpephone/ptim-engine_1.0.bb b/packages/gpephone/ptim-engine_1.0.bb
new file mode 100644
index 0000000000..e1cd76ae30
--- /dev/null
+++ b/packages/gpephone/ptim-engine_1.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Phone input method engine"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/${P}/imengine-${PV}.tar.bz2"
+
+S = "${WORKDIR}/imengine-${PV}"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pydatabase/*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la"
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/gpephone/ptim-headers_1.0.bb b/packages/gpephone/ptim-headers_1.0.bb
new file mode 100644
index 0000000000..2ed36458e4
--- /dev/null
+++ b/packages/gpephone/ptim-headers_1.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Phone input method - shared headers"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/ptim-headers-${PV}/imheaders-${PV}.tar.bz2"
+
+S = "${WORKDIR}/imheaders-${PV}"
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/gpephone/ptim-helper_1.0.bb b/packages/gpephone/ptim-helper_1.0.bb
new file mode 100644
index 0000000000..4d5609e6a2
--- /dev/null
+++ b/packages/gpephone/ptim-helper_1.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Phone input method helper module"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PR = "r1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/${P}/imhelper-${PV}.tar.bz2"
+
+S = "${WORKDIR}/imhelper-${PV}"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps/*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la"
+
+do_stage () {
+    autotools_stage_all
+}
+
+pkg_postinst_${PN}() {
+    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_${PN}() {
+    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
diff --git a/packages/gpephone/ptim-manager_1.0.bb b/packages/gpephone/ptim-manager_1.0.bb
new file mode 100644
index 0000000000..c0955a2176
--- /dev/null
+++ b/packages/gpephone/ptim-manager_1.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Phone input method manager module"
+SECTION = "gpephone"
+PRIORITY = "opti