HOMEPAGE = http://www.freedesktop.org/Software/dbus
 DESCRIPTION = "message bus system for applications to talk to one another"
-DEPENDS = virtual/libc expat
+DEPENDS = virtual/libc expat glib-2.0
 RDEPENDS = libc6 expat
 
 SRC_URI = 'http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
           file://${FILESDIR}/cross.patch;patch=1'
 
-inherit autotools libtool
+inherit autotools libtool pkgconfig
 
-EXTRA_OECONF = '--disable-qt --disable-glib --disable-gtk --disable-tests \
+EXTRA_OECONF = '--disable-qt --disable-gtk --disable-tests \
                --disable-checks --disable-xml-docs --disable-doxygen-docs \
                --with-xml=expat --without-x'
+
+headers = dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h
+
+libname = libdbus-1.so.0.0.0
+glibname = libdbus-glib-1.so.0.0.0
+
+do_stage () {
+       install -m 0755 dbus/.libs/${libname} ${STAGING_LIBDIR}/
+       ln -sf ${libname} ${STAGING_LIBDIR}/libdbus-1.so.0
+       ln -sf ${libname} ${STAGING_LIBDIR}/libdbus-1.so
+       install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/
+
+       install -m 0755 glib/.libs/${glibname} ${STAGING_LIBDIR}/
+       ln -sf ${glibname} ${STAGING_LIBDIR}/libdbus-glib-1.so.0
+       ln -sf ${glibname} ${STAGING_LIBDIR}/libdbus-glib-1.so
+       install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/
+
+       mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
+       for i in ${headers}; do
+               install -m 0644 dbus/$i ${STAGING_INCDIR}/dbus-1.0/dbus/$i
+       done
+
+       install -m 0644 glib/dbus-glib.h ${STAGING_INCDIR}/dbus-1.0/dbus/
+
+       mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+       install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
 
+DESCRIPTION=Data interchange library for GPE
+SECTION=gpe/libs
+PRIORITY=optional
+MAINTAINER="Philip Blundell <pb@handhelds.org>"
+DEPENDS=virtual/libc libmimedir
+
+inherit pkgconfig
+
+SRC_URI = http://gpe.handhelds.org/pub/projects/gpe/source/libgpevtype-${PV}.tar.gz
+
+headers = tag-db.h vcard.h vevent.h vtodo.h
+
+do_stage () {
+       install -m 0755 libgpevtype.so.0 ${STAGING_LIBDIR}/
+       ln -s libgpevtype.so.0 ${STAGING_LIBDIR}/libgpevtype.so
+
+       mkdir -p ${STAGING_INCDIR}/gpe
+       for h in ${headers}; do
+               install -m 0644 gpe/$h ${STAGING_INCDIR}/gpe/${h}
+       done
+}
 
 
 SRC_URI = http://gpe.handhelds.org/pub/projects/gpe/source/libgpewidget-${PV}.tar.gz
 
-headers = init.h render.h errorbox.h smallbox.h pixmaps.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h
+headers = init.h render.h errorbox.h smallbox.h pixmaps.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h
 
 do_stage () {
        install -m 0755 libgpewidget.so.1 ${STAGING_LIBDIR}/