merge of 'bbfe92716c8516623c7f965f29e1674c2d9b98dc'

     and 'fda96508efa311cef118693c03ac023a13f325ca'

104 files changed, 140599 insertions, 243 deletions

diff --git a/classes/gpephone.bbclass b/classes/gpephone.bbclass
new file mode 100644
index 0000000000..57867b5d4b
--- /dev/null
+++ b/classes/gpephone.bbclass
@@ -0,0 +1,7 @@
+DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native "
+GPE_TARBALL_SUFFIX ?= "gz"
+SRC_URI = "${GPEPHONE_MIRROR}/${PN}-${PV}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}"
+FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"
+SECTION ?= "gpe"
+
+inherit gettext autotools
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3eb3ab436f..fd4830d849 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -320,8 +320,9 @@ export palmqtdir = "/opt/QtPalmtop"
 
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
-SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net"
+SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net"
 GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
+GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone"
 GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 XORG_MIRROR = "http://xorg.freedesktop.org/releases"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 4cad129a9d..71eac0d6c5 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -7,6 +7,7 @@ TARGET_ARCH = "i686"
 
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
index b6bb469cd3..cd8014a759 100644
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -5,7 +5,7 @@ SECTION = "base"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
-inherit autotools
+inherit autotools pkgconfig
 
 EXTRA_OECONF = " --enable-dynamic-e2fsck"
 
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index a909419437..4e3038577f 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
 S = "${WORKDIR}/e2fsprogs-${PV}"
@@ -30,6 +30,7 @@ do_stage () {
 	for h in ${ext2fsheaders}; do
 		install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
 	done
+	autotools_stage_all
 }
 
 # blkid used to be part of e2fsprogs but is useful outside, add it
diff --git a/packages/efl/ecore/remove-bad-code.patch b/packages/efl/ecore/remove-bad-code.patch
new file mode 100644
index 0000000000..87a8d16bd6
--- /dev/null
+++ b/packages/efl/ecore/remove-bad-code.patch
@@ -0,0 +1,36 @@
+Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
+===================================================================
+--- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h
++++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
+@@ -19,8 +19,8 @@
+  #define kernel_ulong_t unsigned long 
+  #define BITS_PER_LONG 32
+  #include <linux/input.h>
+- #undef kernel_ulong_t <-added
+- #undef BITS_PER_LONG <-added
++ #undef kernel_ulong_t
++ #undef BITS_PER_LONG
+ #else
+  #include <linux/input.h>
+ #endif
+Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
+===================================================================
+--- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c
++++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
+@@ -1,6 +1,6 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_fb_private.h"
+-
++/*
+ struct input_absinfo {
+ 	__s32 value;
+ 	__s32 minimum;
+@@ -8,7 +8,7 @@ struct input_absinfo {
+ 	__s32 fuzz;
+ 	__s32 flat;
+ };
+-
++*/
+ 
+ #define EV_SYN			0x00
+ #define EV_PWR			0x16
diff --git a/packages/gpephone/.mtn2git_empty b/packages/gpephone/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/.mtn2git_empty
diff --git a/packages/gpephone/addressbook_0.1.bb b/packages/gpephone/addressbook_0.1.bb
new file mode 100644
index 0000000000..71764de6ca
--- /dev/null
+++ b/packages/gpephone/addressbook_0.1.bb
@@ -0,0 +1,12 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS address book"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac libim"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/database"
diff --git a/packages/gpephone/audioplayer_1.0.bb b/packages/gpephone/audioplayer_1.0.bb
new file mode 100644
index 0000000000..e79b294e81
--- /dev/null
+++ b/packages/gpephone/audioplayer_1.0.bb
@@ -0,0 +1,12 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "An audio player for GPE phone edition."
+SECTION     = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac gstreamer libgemwidget"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/themes"
diff --git a/packages/gpephone/calendar_1.0.bb b/packages/gpephone/calendar_1.0.bb
new file mode 100644
index 0000000000..342f81eed4
--- /dev/null
+++ b/packages/gpephone/calendar_1.0.bb
@@ -0,0 +1,12 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "Calendar application for GPE Phone Edition"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler libiac"
+
+GPE_TARBALL_SUFFIX= "gz"
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/database ${datadir}/res"
diff --git a/packages/gpephone/cms92init_0.1.bb b/packages/gpephone/cms92init_0.1.bb
new file mode 100644
index 0000000000..aaa079966d
--- /dev/null
+++ b/packages/gpephone/cms92init_0.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GSM/GPRS mux initializer"
+LICENSE  = "GPL"
+SECTION  = "gpe"
+PRIORITY = "optional"
+DEPENDS  = "glibc"
+PR = "r0"
+
+inherit gpephone
+
+SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2"
+
+
+S  = ${WORKDIR}/GPRS/cms92init-simple
+
+do_compil