merge of '61e3209c19410f3d0436f4afa1f9a1429e8f4caa'

     and 'b38c38c03c4dcaf924cd4f51807cea915710867f'

21 files changed, 234 insertions, 18 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d38974ba25..afa2a95e2b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5766,10 +5766,6 @@ sha256=494636571ae72af7524c3a7703324ef68dbf755f753054317489fe79ac895ae0
 md5=bdcdb1b8ca13dba897c0a2138d1643f5
 sha256=694ea8352edf845b0a7dc0c2e0e990bcb8507f64e405edc048ad115c6578e5f7
 
-[http://gpephone.linuxtogo.org/download/gpephone/libabenabler-0.1/libabenabler-0.1.tar.bz2]
-md5=49fe67302fd76543a7574a73c01395ba
-sha256=512674419ac2013d11eccf4f106d6cfc719c9c2b49215a8f0e89c5327d176a84
-
 [http://search.belnet.be/packages/lineox/4.0/updates/SRPMS/libaio-0.3.103-3.src.rpm]
 md5=3d6ca28cb7cf73ca1d9fe902924bdc84
 sha256=9f578643db9fff6ae088a492e6a4aca3cac4c2cbc51afce551687f4f0d36465f
@@ -6354,10 +6350,6 @@ sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c
 md5=2f0882a711759113b2388a790abe8fd8
 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981
 
-[http://gpephone.linuxtogo.org/download/gpephone/libiac-0.1/libiac-0.1.tar.bz2]
-md5=cf829bb82f84728194c64a41e9f1cf32
-sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af
-
 [ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz]
 md5=b77a17e4a5a817100ad4b2613935055e
 sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index ead766e3ee..11145fe330 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -9,6 +9,7 @@
 
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "2866"
@@ -28,6 +29,7 @@ SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
+SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgsmd ?= "3451"
 SRCREV_pn-libgsmd-devel ?= "3293"
@@ -116,7 +118,7 @@ SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
-SRCREV_pn-tmut ?= "15"
+SRCREV_pn-tmut ?= "60"
 SRCREV_pn-webkit-gtk ?= "27222"
 SRCREV_pn-webkit-qt ?= "27222"
 SRCREV_pn-webkit-qtopia ?= "27222"
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 = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers libiac"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/ptim-manager-${PV}/immanager-${PV}.tar.bz2"
+
+S = "${WORKDIR}/immanager-${PV}"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/immodules/*.so ${libdir}/gtk-2.0/*/immodules/ptim"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la"
+
+
+do_install_append () {
+	# That's evil... 
+	install -m 644 ${S}/conf/imconfig ${D}/${libdir}/gtk-2.0/*/immodules/ptim
+}
+
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/libical/.mtn2git_empty b/packages/libical/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libical/.mtn2git_empty
diff --git a/packages/libical/libical/.mtn2git_empty b/packages/libical/libical/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libical/libical/.mtn2git_empty
diff --git a/packages/libical/libical/pthread-link.patch b/packages/libical/libical/pthread-link.patch
new file mode 100644
index 0000000000..4fb1f190c1
--- /dev/null
+++ b/packages/libical/libical/pthread-link.patch
@@ -0,0 +1,11 @@
+--- libical-0.27.orig/src/libical/Makefile.am	2007-02-27 23:27:56.000000000 +0100
++++ libical-0.27/src/libical/Makefile.am	2007-11-27 15:08:38.000000000 +0100
+@@ -47,7 +47,7 @@
+ 	-I$(top_builddir)/src	\
+ 	-I$(srcdir)
+ 
+-libical_la_LDFLAGS = -version-info 27:6:27
++libical_la_LDFLAGS = -version-info 27:6:27 $(PTHREAD_LIBS)
+ 
+ 
+ libical_la_SOURCES =		\
diff --git a/packages/libical/libical_0.27.bb b/packages/libical/libical_0.27.bb
new file mode 100644
index 0000000000..b41b2e688a
--- /dev/null
+++ b/packages/libical/libical_0.27.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
+HOMEPAGE = "http://www.softwarestudio.org/softwarestudio/app.php/libical"
+SECTION = "libs"
+LICENSE = "LGPL / MPL"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz \
+           file://pthread-link.patch;patch=1"
+
+
+inherit autotools
+
+do_stage () {
+    autotools_stage_all
+}
diff --git a/packages/tinymail/libtinymail_svn.bb b/packages/tinymail/libtinymail_svn.bb
index 300fee2cfa..7d396fe968 100644
--- a/packages/tinymail/libtinymail_svn.bb
+++ b/packages/tinymail/libtinymail_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile d
 SECTION = "x11/utils"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
-PV = "0.0.1+svnr${SRCREV}"
+PV = "0.0.5+svnr${SRCREV}"
 PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/tinymail/tmut_svn.bb b/packages/tinymail/tmut_svn.bb
index 1c59890720..abe7417898 100644
--- a/packages/tinymail/tmut_svn.bb
+++ b/packages/tinymail/tmut_svn.bb
@@ -3,15 +3,12 @@ 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"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
 
-SRC_URI = "svn://svn.tinymail.org/svn/tmut/;module=trunk;proto=http \
-           file://tmut-build-oe.patch;patch=1;pnum=0"
+SRC_URI = "svn://svn.tinymail.org/svn/tmut/;module=trunk;proto=http"
 
 inherit pkgconfig autotools
 S = "${WORKDIR}/trunk"