merge of 'b3a66a0251c3a47228fa0f4ce4cdc78856bb70f3'

     and 'b98d57aa4b2e59e402bec4959253416a68cbf4a2'

9 files changed, 113 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8d802c3b7c..1e6b9821b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -51,14 +51,15 @@ Recipes:    at76c503a, dropbear, handhelds-sa, handhelds-pxa
 Person:     Florian Boor
 Mail:       fb@kernelconcepts.de
 Website:    http://fl0rian.wordpress.com, http://www.kernelconcepts.de/~fuchs/
-Machines:   nokia770, netvista, htcuniversal, netbook-pro, htctornado
+Machines:   nokia770, netvista, htcuniversal, netbook-pro, htctornado, bd-neon
 Distros:  
 Interests:  GPEPhone, OpenSync, GPE, Matchbox, *dbus*, X, sqlite, Palm TX,
 interests:  phone devices
 Recipes:    gpe-*, libgpe*, libeventdb, libtododb, libcontactsdb, xserver-common
-Recipes:    gomunicator, mbmerlin, prismstumbler gkdial, fbreader, networkmanager
+Recipes:    gomunicator, mbmerlin, prismstumbler, gkdial, fbreader, networkmanager
 Recipes:    minimix, minilite, miniclipboard, gpephone*
 Recipes:    task-sdk-sbox, meta-sdk-sbox
+Recipes:    tmut, tea
 
 Person:     Graeme Gregory
 Mail:       dp@xora.org.uk
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e161f858a6..e537c66c30 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -111,6 +111,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
+SRCREV_pn-tmut ?= "15"
 SRCREV_pn-webkit-gtk ?= "27222"
 SRCREV_pn-webkit-qt ?= "27222"
 SRCREV_pn-webkit-qtopia ?= "27222"
@@ -121,4 +122,3 @@ SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-usbpath ?= "3108"
 SRCREV_pn-usbpath-native ?= "3108"
-
diff --git a/packages/tinymail/libtinymail-0.0.3/.mtn2git_empty b/packages/tinymail/libtinymail-0.0.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tinymail/libtinymail-0.0.3/.mtn2git_empty
diff --git a/packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch b/packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch
new file mode 100644
index 0000000000..cfda4cb0f2
--- /dev/null
+++ b/packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch
@@ -0,0 +1,18 @@
+--- m4/ticonv.m4~	2007-10-30 13:57:32.000000000 +0100
++++ trunk/m4/ticonv.m4	2007-10-30 13:57:32.000000000 +0100
+@@ -76,15 +76,6 @@
+ 
+ CFLAGS="$CFLAGS -I$srcdir"
+ 
+-AC_MSG_CHECKING(preferred charset formats for system iconv)
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#define CONFIGURE_IN
+-#include "iconv-detect.c"
+-]])],[
+-	AC_MSG_RESULT(found)
+-],[
+-	AC_MSG_RESULT(not found)
+-],[])
+ 
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
diff --git a/packages/tinymail/libtinymail.inc b/packages/tinymail/libtinymail.inc
new file mode 100644
index 0000000000..29c3f4d1d1
--- /dev/null
+++ b/packages/tinymail/libtinymail.inc
@@ -0,0 +1,54 @@
+DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices"
+SECTION = "x11/utils"
+LICENSE = "LGPL"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
+
+EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
+
+SRC_URI = "http://tinymail.org/files/releases/pre-releases/v${PV}/libtinymail-${PV}.tar.bz2 \
+	   file://no-iconv-detect.patch;patch=1 \
+	   file://iconv-detect.h \
+	   file://gtk-doc.m4 \
+           file://gtk-doc.make"
+
+inherit pkgconfig autotools
+
+do_configure_prepend() {
+        mkdir -p m4
+        install ${WORKDIR}/gtk-doc.m4 ./m4/
+        install ${WORKDIR}/gtk-doc.make ./
+
+	cp ${WORKDIR}/iconv-detect.h ${S}/libtinymail-camel/camel-lite/
+}
+
+
+PACKAGES =+ 	"lib${PN}-gpe lib${PN}-gpe-dev \
+		 tinymail-camel-lite tinymail-camel-lite-dev tinymail-camel-lite-dbg \
+		 libtinymailui-gtk libtinymailui libtinymail-camel lib${PN}"
+
+FILES_lib${PN} =		  "${libdir}/lib*.so.*"
+FILES_libtinymailui =		  "${libdir}/libtinymailui*.so.*"
+FILES_libtinymailui-gtk	=	  "${libdir}/libtinymailui-gtk*.so.*"
+
+FILES_libtinymail-camel = 	  "${libdir}/libtinymail-camel*.so.*"
+
+FILES_lib${PN}-gpe = 		  "${libdir}/libtinymail-gpe*.so.*"
+FILES_lib${PN}-gpe-dev = 	  "${libdir}/libtinymail-gpe*.so \
+                                   ${libdir}/libtinymail-gpe*.a \
+				   ${libdir}/libtinymail-gpe*.la"
+
+LEAD_SONAME_tinymail-camel-lite = "libcamel-lite"
+FILES_tinymail-camel-lite += 	  "${libdir}/libcamel*.so.* \
+				   ${libdir}/camel-lite-1.2/camel-providers/*.so \
+			      	   ${libdir}/camel-lite-1.2/camel-providers/*.urls "
+FILES_tinymail-camel-lite-dev +=  "${libdir}/libcamel-lite*.so \
+				   ${libdir}/libcamel-lite*.a \
+				   ${libdir}/libcamel-lite*.la \
+				   ${libdir}/camel-lite-1.2/camel-providers/*.la \
+				   ${libdir}/camel-lite-1.2/camel-providers/*.a "
+FILES_tinymail-camel-lite-dbg +=  "${libdir}/camel-lite-1.2/camel-providers/.debug"
+
+
+do_stage () {
+	autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/tinymail/libtinymail_0.0.3.bb b/packages/tinymail/libtinymail_0.0.3.bb
new file mode 100644
index 0000000000..342f11ba85
--- /dev/null
+++ b/packages/tinymail/libtinymail_0.0.3.bb
@@ -0,0 +1 @@
+require libtinymail.inc
diff --git a/packages/tinymail/tmut/.mtn2git_empty b/packages/tinymail/tmut/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tinymail/tmut/.mtn2git_empty
diff --git a/packages/tinymail/tmut/tmut-build-oe.patch b/packages/tinymail/tmut/tmut-build-oe.patch
new file mode 100644
index 0000000000..fd228c9818
--- /dev/null
+++ b/packages/tinymail/tmut/tmut-build-oe.patch
@@ -0,0 +1,19 @@
+--- configure.ac~	2007-10-30 14:56:46.000000000 +0100
++++ configure.ac	2007-10-30 14:56:46.000000000 +0100
+@@ -20,7 +20,7 @@
+ 	libtinymail-camel-1.0 
+ 	libtinymailui-1.0 
+ 	libtinymailui-gtk-1.0
+-	libtinymail-gnome-desktop-1.0
++	libtinymail-gpe-1.0
+ ) 
+ 
+ AC_SUBST(TMUT_CFLAGS)
+--- src/Makefile.am~	2007-10-30 14:57:00.000000000 +0100
++++ src/Makefile.am	2007-10-30 14:57:00.000000000 +0100
+@@ -1,4 +1,4 @@
+-INCLUDES = $(TMUT_CFLAGS) -DGNOMEDESKTOP
++INCLUDES = $(TMUT_CFLAGS) -DGPE
+ 
+ bin_PROGRAMS = tmut
+ 
diff --git a/packages/tinymail/tmut_svn.bb b/packages/tinymail/tmut_svn.bb
new file mode 100644
index 0000000000..1c59890720
--- /dev/null
+++ b/packages/tinymail/tmut_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail"
+SECTION = "x11/utils"
+LICENSE = "LGPL"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r0"
+
+SRCREV ?= "15"
+
+DEFAULT_PREFERENCE = "-1"
+
+
+SRC_URI = "svn://svn.tinymail.org/svn/tmut/;module=trunk;proto=http \
+           file://tmut-build-oe.patch;patch=1;pnum=0"
+
+inherit pkgconfig autotools
+S = "${WORKDIR}/trunk"