62 files changed, 0 insertions, 1389 deletions
diff --git a/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc b/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc
deleted file mode 100644
index 09df0993ae..0000000000
--- a/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SRCREV_pn-dfu-util-native ??= "3139"
-SRCREV_pn-dfu-util ??= "3139"
-SRCREV_pn-dialer ??= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
-SRCREV_pn-gsm0710muxd ??= "6fecc78198dd821bbe29efd096bd8fecd855179d"
-SRCREV_pn-gsmd2 ??= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
-SRCREV_pn-libmokogsmd2 ??= "4334"
-SRCREV_pn-libmokojournal2 ??= "3473"
-SRCREV_pn-libmokopanelui2 ??= "3349"
-SRCREV_pn-libmokoui2 ??= "4342"
-SRCREV_pn-moko-gtk-engine ??= "3612"
-SRCREV_pn-openmoko-alsa-scenarios ??= "4406"
-SRCREV_pn-openmoko-appearance ??= "3262"
-SRCREV_pn-openmoko-appmanager2 ??= "3442"
-SRCREV_pn-openmoko-browser2 ??= "4172"
-SRCREV_pn-openmoko-calculator2 ??= "3655"
-SRCREV_pn-openmoko-common2 ??= "3259"
-SRCREV_pn-openmoko-contacts2 ??= "418"
-SRCREV_pn-openmoko-dates2 ??= "673"
-SRCREV_pn-openmoko-dialer2 ??= "4448"
-SRCREV_pn-openmoko-panel-gsm ??= "4335"
-SRCREV_pn-openmoko-dialer3 ??= "111"
-SRCREV_pn-openmoko-feedreader2 ??= "3645"
-SRCREV_pn-openmoko-firststart2 ??= "3158"
-SRCREV_pn-openmoko-icon-theme-standard2 ??= "4232"
-SRCREV_pn-openmoko-mediaplayer2 ??= "4173"
-SRCREV_pn-openmoko-messages2 ??= "4340"
-SRCREV_pn-openmoko-sample2 ??= "3537"
-SRCREV_pn-openmoko-sound-theme-standard2 ??= "4271"
-SRCREV_pn-openmoko-tasks2 ??= "403"
-SRCREV_pn-openmoko-terminal2 ??= "4039"
-SRCREV_pn-openmoko-theme-standard2 ??= "4338"
-SRCREV_pn-openmoko-today2-folders ??= "3704"
-SRCREV_pn-openmoko-today2 ??= "4168"
-SRCREV_pn-openmoko-worldclock2 ??= "3365"
-SRCREV_pn-usbpath-native ??= "3172"
-SRCREV_pn-usbpath ??= "3172"
diff --git a/meta-openmoko/conf/layer.conf b/meta-openmoko/conf/layer.conf
deleted file mode 100644
index 88f15b6db8..0000000000
--- a/meta-openmoko/conf/layer.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-# We have a packages directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
-BBFILE_COLLECTIONS += "openmoko"
-BBFILE_PATTERN_moblin := "^${LAYERDIR}/"
-BBFILE_PRIORITY_moblin = "5"
-require conf/distro/include/meta-openmoko-scm-revisions.inc
diff --git a/meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb b/meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb
deleted file mode 100644
index c049500a61..0000000000
--- a/meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require dfu-util_${PV}.bb
-inherit native deploy
-DEPENDS = "libusb-native usbpath-native"
-do_deploy() {
-        install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util
-}
-addtask deploy before do_package after do_install
diff --git a/meta-openmoko/packages/dfu-util/dfu-util_svn.bb b/meta-openmoko/packages/dfu-util/dfu-util_svn.bb
deleted file mode 100644
index 4224fd1576..0000000000
--- a/meta-openmoko/packages/dfu-util/dfu-util_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "USB Device Firmware Upgrade utility"
-SECTION = "devel"
-AUTHOR = "Harald Welte"
-LICENSE = "GPL"
-PV = "0.1+svnr${SRCREV}"
-PR = "r0"
-DEPENDS = "libusb usbpath"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http"
-S = "${WORKDIR}/dfu-util"
-inherit autotools
diff --git a/meta-openmoko/packages/dialer/dialer_git.bb b/meta-openmoko/packages/dialer/dialer_git.bb
deleted file mode 100644
index 602565f04f..0000000000
--- a/meta-openmoko/packages/dialer/dialer_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "The Dialer"
-DEPENDS = "pulseaudio eds-dbus libjana libnotify libgsmd"
-LICENSE = "GPL"
-PV = "0.0+gitr${SRCREV}"
-PR = "r5"
-inherit autotools pkgconfig
-SRC_URI = "git://folks.o-hand.com/thomas/git/phone.git;protocol=http"
-S = "${WORKDIR}/git"
-EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
-FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
-FILES_${PN} += "${datadir}/icons"
-\ No newline at end of file
diff --git a/meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb b/meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb
deleted file mode 100644
index 410ac36e2f..0000000000
--- a/meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "GSM 07.10 muxer userspace daemon"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
-AUTHOR = "M. Dietrich"
-SECTION = "console/network"
-DEPENDS = "dbus dbus-glib"
-LICENSE = "GPL"
-PV = "0.9.1+gitr${SRCREV}"
-SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-inherit autotools
-# install init script for people who want to manually
-# start/stop it, but don't add runlevels.
-do_install_append() {
-        install -d ${D}${sysconfdir}/init.d
-        install -m 0755 data/gsm0710muxd ${D}${sysconfdir}/init.d/
-}
-FILES_${PN} += "${datadir} ${sysconfdir}"
diff --git a/meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch b/meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch
deleted file mode 100644
index 01c598af48..0000000000
--- a/meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---
- libfreesmartphone/Makefile.am |   14 +++++++-------
- serial/Makefile.am            |    2 +-
- src/Makefile.am               |   14 +++++++-------
- 3 files changed, 15 insertions(+), 15 deletions(-)
--- git.orig/libfreesmartphone/Makefile.am
-+++ git/libfreesmartphone/Makefile.am
-@@ -21,47 +21,47 @@ fso-marshallers.h: $(top_srcdir)/src/sma
- fso-marshallers.c: $(top_srcdir)/src/smartphone_marshaller.txt
-        glib-genmarshal --prefix fso_marshaller --body $(top_srcdir)/src/smartphone_marshaller.txt > fso-marshallers.c
- 
- 
- freesmartphone-call-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_call --mode=glib-client \
-                    --output=freesmartphone-call-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
- 
- freesmartphone-sms-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_sms --mode=glib-client \
-                    --output=freesmartphone-sms-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
- 
- freesmartphone-device-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_device --mode=glib-client \
-                    --output=freesmartphone-device-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
- 
- freesmartphone-sim-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_sim --mode=glib-client \
-                    --output=freesmartphone-sim-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
- 
- freesmartphone-phonebook-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_phonebook --mode=glib-client \
-                    --output=freesmartphone-phonebook-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
- 
- freesmartphone-pdp-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_pdp --mode=glib-client \
-                    --output=freesmartphone-pdp-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
- 
- freesmartphone-network-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_network --mode=glib-client \
-                    --output=freesmartphone-network-binding.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
- 
- CLEANFILES = $(BUILT_SOURCES)
--- git.orig/serial/Makefile.am
-+++ git/serial/Makefile.am
-@@ -11,11 +11,11 @@ COMMON_LDFLAGS =  -avoid-version -module
- BUILT_SOURCES = fsomuxer_client.h
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
- fsomuxer_client.h: fsomuxer.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --mode=glib-client \
-                    --output=fsomuxer_client.h \
-                    fsomuxer.xml
- 
- 
--- git.orig/src/Makefile.am
-+++ git/src/Makefile.am
-@@ -30,47 +30,47 @@ dbus_marshal.h: $(srcdir)/smartphone_mar
- dbus_marshal.c: $(srcdir)/smartphone_marshaller.txt
-        glib-genmarshal --prefix gsmd_smartphone_marshaller --body $(srcdir)/smartphone_marshaller.txt > dbus_marshal.c
- 
- 
- dbus_call_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_call --mode=glib-server \
-                    --output=dbus_call_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
- 
- dbus_sms_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_sms --mode=glib-server \
-                    --output=dbus_sms_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
- 
- dbus_device_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_device --mode=glib-server \
-                    --output=dbus_device_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
- 
- dbus_sim_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_sim --mode=glib-server \
-                    --output=dbus_sim_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
- 
- dbus_phonebook_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_phonebook --mode=glib-server \
-                    --output=dbus_phonebook_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
- 
- dbus_pdp_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_pdp --mode=glib-server \
-                    --output=dbus_pdp_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
- 
- dbus_network_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
-       $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
-+       $(LIBTOOL) --mode=execute dbus-binding-tool \
-                   --prefix=smartphone_network --mode=glib-server \
-                    --output=dbus_network_glue.h \
-                    $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
- 
- gsmd-types.h: $(srcdir)/gsmd-error.h
diff --git a/meta-openmoko/packages/freesmartphone/gsmd2_git.bb b/meta-openmoko/packages/freesmartphone/gsmd2_git.bb
deleted file mode 100644
index 8c1cf5b7e2..0000000000
--- a/meta-openmoko/packages/freesmartphone/gsmd2_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "GSM 07.07 phone server"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
-AUTHOR = "Ixonos Team"
-SECTION = "console/network"
-DEPENDS = "dbus-native dbus dbus-glib"
-RDEPENDS = "gsm0710muxd"
-LICENSE = "GPL"
-PV = "0.1.0+gitr${SRCREV}"
-PR = "r3"
-SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master \
-           file://fix-dbus-location.patch;patch=1"
-S = "${WORKDIR}/git"
-inherit autotools
-EXTRA_OECONF = "--disable-tests"
-do_install_append () {
-        install -d ${D}${sysconfdir}/gsmd2
-        install -d ${D}${sysconfdir}/dbus-1/system.d/
-        install -m 0644 ${S}/res/freesmartphone.conf ${D}${sysconfdir}/dbus-1/system.d/
-        install -d ${D}${datadir}/dbus-1/system-services
-        install -m 0644 ${S}/gsmd2.service ${D}${datadir}/dbus-1/system-services/
-}
-PACKAGES =+ "libgsmd2 libfreesmartphone"
-FILES_libgsmd2 = "${libdir}/libgsmd2.so.* ${libdir}/gsmd2/*.so"
-FILES_libfreesmartphone = "${libdir}/libfreesmartphone.so.*"
-FILES_${PN}-dev += "${libdir}/gsmd2/*.*a"
-FILES_${PN} = "${bindir}/gsmd2 ${sysconfdir}/dbus-1/ ${datadir}/dbus-1/"
diff --git a/meta-openmoko/packages/images/poky-image-openmoko.bb b/meta-openmoko/packages/images/poky-image-openmoko.bb
deleted file mode 100644
index bf151e5422..0000000000
--- a/meta-openmoko/packages/images/poky-image-openmoko.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES} apps-x11-games"
-inherit poky-image
-IMAGE_INSTALL += "openmoko-today2 openmoko-dialer2 openmoko-theme-standard2 dates web-webkit eds-dbus tasks"
-IMAGE_INSTALL += "openmoko-contacts2 openmoko-session2 \
-    matchbox-keyboard \
-    matchbox-stroke \
-    matchbox-config-gtk \
-    matchbox-themes-gtk \
-    xcursor-transparent-theme \
-    openmoko-icon-theme-standard \
-    settings-daemon"
diff --git a/meta-openmoko/packages/libspiff/files/autofoo.patch b/meta-openmoko/packages/libspiff/files/autofoo.patch
deleted file mode 100644
index 5f96a2c217..0000000000
--- a/meta-openmoko/packages/libspiff/files/autofoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libspiff-0.8.2/configure.in
-===================================================================
--- libspiff-0.8.2.orig/configure.in
-+++ libspiff-0.8.2/configure.in
-@@ -80,24 +80,6 @@ AC_ARG_WITH(uriparser-lib, [  --with-uri
- 
- 
- 
-# Local headers must come very first. Otherwise we
-# risk including headers of an already installed
-# libSpiff version if its path is in CPPFLAGS
-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
-
-
-
-# Append $prefix as a fallback at the very end
-if test "x${prefix}" != "xNONE"; then
-       WORKING_PREFIX=${prefix}
-else
-       WORKING_PREFIX=${ac_default_prefix}
-fi
-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
-
-
-
- # Check presence
- EXPAT_MISSING="Please install libexpat 1.95.8 or later.
-    On Ubuntu enter 'sudo apt-get install libexpat-dev'."
diff --git a/meta-openmoko/packages/libspiff/files/makefile.patch b/meta-openmoko/packages/libspiff/files/makefile.patch
deleted file mode 100644
index 87ec9a345c..0000000000
--- a/meta-openmoko/packages/libspiff/files/makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---
- Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
--- libspiff-0.8.3.orig/Makefile.am
-+++ libspiff-0.8.3/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects
-+AUTOMAKE_OPTIONS = 1.10 gnu dist-zip dist-bzip2 subdir-objects
- 
- lib_LTLIBRARIES = libspiff.la
- 
- bin_PROGRAMS = \
-        examples/check/spiff_check \
diff --git a/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb b/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb
deleted file mode 100644
index f10ff59f69..0000000000
--- a/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application."
-HOMEPAGE = "http://libspiff.sf.net"
-SECTION = "libs"
-LICENSE = "BSD"
-DEPENDS = "expat liburiparser"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \
-           file://autofoo.patch;patch=1 \
-           file://makefile.patch;patch=1"
-S = "${WORKDIR}/libspiff-${PV}"
-inherit autotools pkgconfig lib_package
-EXTRA_OECONF = "\
-  --with-expat=${STAGING_LIBDIR}/.. \
-  --with-uriparser=${STAGING_LIBDIR}/.. \
-"
-CPPFLAGS += "-I${S}/include"
diff --git a/meta-openmoko/packages/liburiparser/files/autofoo.patch b/meta-openmoko/packages/liburiparser/files/autofoo.patch
deleted file mode 100644
index f578b21886..0000000000
--- a/meta-openmoko/packages/liburiparser/files/autofoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
--- /tmp/configure.in   2008-06-21 12:20:52.000000000 +0200
-+++ uriparser-0.5.1/configure.in        2008-06-21 12:21:16.000000000 +0200
-@@ -9,6 +9,7 @@
- AC_PROG_LIBTOOL
- AC_HEADER_STDC
- 
-+AM_PROG_CC_C_O
- 
- 
- # URI_SIZEDOWN
diff --git a/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb b/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb
deleted file mode 100644
index 55ef0a057e..0000000000
--- a/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library."
-HOMEPAGE = "http://uriparser.sf.net"
-SECTION = "libs"
-LICENSE = "BSD"
-SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/uriparser-${PV}"
-inherit autotools pkgconfig
diff --git a/meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb b/meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb
deleted file mode 100644
index e6b3d0bd05..0000000000
--- a/meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "The Openmoko Dialer"
-SECTION = "openmoko/pim"
-HOMEPAGE = "http://projects.openmoko.org/projects/shr/"
-PKG_TAGS_${PN} = "group::communication"
-DEPENDS = " libmokoui2 libmokojournal2 pulseaudio dbus-glib libnotify libjana"
-RDEPENDS = "gsmd2"
-PV = "0.0.1+svnr${SRCREV}"
-SRCREV = "${AUTOREV}"
-PR = "r1"
-inherit autotools pkgconfig openmoko2
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/shr/trunk/;module=${PN};proto=http"
-LICENSE = "${@openmoko_two_get_license(d)}"
-SUBDIR = "${@openmoko_two_get_subdir(d)}"
-S = "${WORKDIR}/${PN}"
-FILES_${PN} += "${datadir}/icons"
diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
deleted file mode 100644
index 261116ece7..0000000000
--- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
deleted file mode 100644
index d9fd351c84..0000000000
--- a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "eds-dbus"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2 lib_package
-do_configure_prepend() {
-        touch gtk-doc.make
-}
diff --git a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
deleted file mode 100644
index a715ff8f0d..0000000000
--- a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+ matchbox-panel-2 dbus"
-PV = "0.3.0+svnr${SRCREV}"
-PR = "r0"
-inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
deleted file mode 100644
index f427fa8f99..0000000000
--- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2
-do_configure_prepend() {
-        touch gtk-doc.make
-}
diff --git a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
deleted file mode 100644
index 2939ac3fc1..0000000000
--- a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Moko GTK+ theme engine"
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-inherit openmoko2
-PACKAGES += "moko-gtk-theme"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_moko-gtk-theme = "${datadir}/themes"
-RDEPENDS_${PN} = "moko-gtk-theme"
diff --git a/meta-openmoko/packages/openmoko2/neod/htc.patch b/meta-openmoko/packages/openmoko2/neod/htc.patch
deleted file mode 100644
index 0ced894a45..0000000000
--- a/meta-openmoko/packages/openmoko2/neod/htc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: neod/configure.ac
-===================================================================
--- neod.orig/configure.ac      2007-09-15 23:01:30.000000000 +0200
-+++ neod/configure.ac   2007-09-15 23:02:01.000000000 +0200
-@@ -32,6 +32,10 @@
-         NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
- fi
- 
-+if test x"$neod_platform" = x"htc"; then
-+       NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
-+fi
-+
- CFLAGS=$NEOD_CFLAGS
- 
- AC_OUTPUT([
-Index: neod/src/buttonactions.c
-===================================================================
--- neod.orig/src/buttonactions.c       2007-09-15 23:02:15.000000000 +0200
-+++ neod/src/buttonactions.c    2007-09-15 23:04:16.000000000 +0200
-@@ -63,6 +63,12 @@
-     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
- #endif
- 
-+#ifdef NEOD_PLATFORM_HTC
-+    #define AUX_BUTTON_KEYCODE 0xd4   /* camera */
-+    #define POWER_BUTTON_KEYCODE 0x74 /* power */
-+    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
-+#endif
-+
- #define HEADPHONE_INSERTION_SWITCHCODE 0x02
- 
- GPollFD input_fd[10];
diff --git a/meta-openmoko/packages/openmoko2/neod/ipaq.patch b/meta-openmoko/packages/openmoko2/neod/ipaq.patch
deleted file mode 100644
index 19b61ab1f5..0000000000
--- a/meta-openmoko/packages/openmoko2/neod/ipaq.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: neod/src/buttonactions.c
-===================================================================
--- neod.orig/src/buttonactions.c       2007-09-29 17:24:43.000000000 +0200
-+++ neod/src/buttonactions.c    2007-09-29 17:24:49.000000000 +0200
-@@ -69,6 +69,12 @@
-     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
- #endif
- 
-+#ifdef NEOD_PLATFORM_IPAQ
-+    #define AUX_BUTTON_KEYCODE 89   /* _KEY_RECORD */
-+    #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
-+    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
-+#endif
-+
- #define HEADPHONE_INSERTION_SWITCHCODE 0x02
- 
- GPollFD input_fd[10];
-Index: neod/configure.ac
-===================================================================
--- neod.orig/configure.ac      2007-09-29 17:25:12.000000000 +0200
-+++ neod/configure.ac   2007-09-29 17:25:48.000000000 +0200
-@@ -36,6 +36,10 @@
-        NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
- fi
- 
-+if test x"$neod_platform" = x"ipaq"; then
-+       NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
-+fi
-+
- CFLAGS=$NEOD_CFLAGS
- 
- AC_OUTPUT([
diff --git a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
deleted file mode 100644
index 08531e898e..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Package for the different scenarios used by Openmoko"
-SECTION = "openmoko/base"
-PV = "1.0+svnr${SRCREV}"
-PR = "r1"
-COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
-SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
-S = "${WORKDIR}/${MACHINE_ARCH}"
-do_install() {
-    install -d ${D}${datadir}/openmoko/scenarios/
-    install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
-    install -d ${D}${sysconfdir}/
-    install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
-}
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
-FILES_${PN} += "${datadir}/openmoko"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb
deleted file mode 100644
index a6f5c11171..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "The Openmoko Appearance Editor"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 gconf gtk+"
-RDEPENDS = "libedata-cal openmoko-today2-folders"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-inherit openmoko2 gtk-icon-cache 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff
deleted file mode 100644
index 89f79496a0..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/current-page.c
-===================================================================
--- openmoko-browser2/src/current-page.c        (revision 3249)
-+++ openmoko-browser2/src/current-page.c        (working copy)
-@@ -129,7 +129,7 @@
-     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8);
- 
- 
-    data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new ();
-+    data->currentFingerScroll = moko_finger_scroll_new ();
-     gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0);
- }
- 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
deleted file mode 100644
index 18e8a88e25..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac
--- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200
-+++ openmoko-browser2/configure.ac      2008-03-05 12:12:32.954623867 +0100
-@@ -40,7 +40,7 @@
- # base deps
- PKG_CHECK_MODULES(OPENMOKO,  libmokoui2    >= 0.1.0)
- PKG_CHECK_MODULES(GTHREAD,   gthread-2.0           )
-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
-+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
- 
- # glib-genmarshal
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h
--- openmoko-browser2.orig/src/browser-data.h   2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/browser-data.h        2008-03-05 12:12:50.497959252 +0100
-@@ -27,7 +27,7 @@
- #ifndef OPENMOKO_BROWSER_DATA_H
- #define OPENMOKO_BROWSER_DATA_H
- 
-#include "webkitwebview.h"
-+#include <webkit/webkitwebview.h>
- 
- #include <glib.h>
- #include <gtk/gtk.h>
-diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c
--- openmoko-browser2.orig/src/current-page.c   2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/current-page.c        2008-03-05 12:13:56.032884030 +0100
-@@ -28,8 +28,8 @@
- #include "current-page.h"
- 
- #include <moko-finger-scroll.h>
-#include <webkitwebframe.h>
-#include <webkitwebview.h>
-+#include <webkit/webkitwebframe.h>
-+#include <webkit/webkitwebview.h>
- 
- /*
-  * From a list of BrowserPage's in BrowserData::currentPage show
-@@ -42,7 +42,7 @@
- static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
- {
-     g_return_if_fail (data->currentPage);
-    webkit_web_view_go_backward(data->currentPage->webKitPage);
-+    webkit_web_view_go_back(data->currentPage->webKitPage);
- }
- 
- static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
-@@ -66,7 +66,7 @@
-     g_assert (page == data->currentPage->webKitPage);
- 
-     if (prog == 100) {
-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
-+        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page));
-         gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
-         gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
-     }
-@@ -176,7 +176,7 @@
-      * Update the GtkToolItems
-      */
-     /* XXX ### FIXME TODO check if we should show stop/reload */
-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
-+    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage));
-     gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
-     gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
-     gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
-diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c
--- openmoko-browser2.orig/src/main.c   2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/main.c        2008-03-05 12:14:46.337942098 +0100
-@@ -33,7 +33,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- 
-#include <webkit.h>
-+#include <webkit/webkit.h>
- 
- #include <moko-finger-scroll.h>
- #include <moko-stock.h>
-@@ -55,7 +55,6 @@
-     gdk_threads_init ();
-     gdk_threads_enter ();
-     gtk_init (&argc, &argv);
-    webkit_init ();
-     moko_stock_register ();
-     g_set_application_name (_("Browser"));
- 
-diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c
--- openmoko-browser2.orig/src/open-pages-page.c        2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/open-pages-page.c     2008-03-05 12:13:37.671282983 +0100
-@@ -28,8 +28,8 @@
- #include "open-pages-page.h"
- #include "current-page.h"
- 
-#include <webkitwebframe.h>
-#include <webkitwebview.h>
-+#include <webkit/webkitwebframe.h>
-+#include <webkit/webkitwebview.h>
- #include <moko-finger-scroll.h>
- 
- #include <glib/gi18n.h>
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
deleted file mode 100644
index 6d8349313f..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "The Openmoko Webbrowser"
-SECTION = "openmoko/apps"
-DEPENDS += "intltool libmokoui2 check webkit-gtk"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2
-SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
-#SRC_URI += "file://fingerscroll.diff;patch=1"
-do_compile_prepend() {
-        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
deleted file mode 100644
index ba202bcec9..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "A Calculator for Openmoko"
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
deleted file mode 100644
index 0ea381437c..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Common files for the Openmoko framework"
-SECTION = "openmoko/base"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-inherit openmoko2
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
-S = "${WORKDIR}"
-ALLOW_EMPTY = "1"
-dirs = "pixmaps"
-do_install() {
-        find . -name .svn | xargs rm -rf
-        install -d ${D}${datadir}
-        for i in ${dirs}; do
-                cp -fR $i ${D}${datadir}/$i;
-        done
-        # moved to xserver-kdrive-common
-        rm -f ${D}${datadir}/pixmaps/xsplash*
-}
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
deleted file mode 100644
index 4d7b1bcd7d..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "The Openmoko Address Book"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 dbus-glib libjana"
-RDEPENDS = "libedata-book"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
-inherit openmoko2
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
-S = "${WORKDIR}/hito/"
-EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
deleted file mode 100644
index ff3bfa62a6..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "The Openmoko Calendar"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
-RDEPENDS = "libedata-cal"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2 pkgconfig
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=openmoko2;proto=http"
-S = "${WORKDIR}/openmoko2/"
-EXTRA_OECONF = "--with-frontend=openmoko"
-do_configure_prepend() {
-        touch gtk-doc.make
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
deleted file mode 100644
index c6f34f4131..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig   2008-02-14 17:47:23.000000000 +0800
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c        2008-02-14 17:48:19.000000000 +0800
-@@ -38,7 +38,7 @@
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
- #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
deleted file mode 100644
index 72c516f5d6..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
--- openmoko-dialer2/src/phone-kit/moko-notify.c        (revision 4051)
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c        (working copy)
-@@ -37,8 +37,8 @@
-         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
deleted file mode 100644
index 5969726857..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
+++ /dev/null
@@ -1,117 +0,0 @@
--- openmoko-dialer2/src/moko-dialer.c~ 2007-08-27 20:02:37.000000000 +0930
-+++ openmoko-dialer2/src/moko-dialer.c  2007-08-27 18:59:37.000000000 +0930
-@@ -69,8 +69,7 @@
- 
-   /* Registration variables */
-   guint               reg_timeout;
-  gboolean            reg_request;
-  gboolean            registered;
-+  MokoGsmdConnectionNetregType registered;
- };
- 
- enum
-@@ -292,8 +291,7 @@
- 
-   moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), FALSE);
-     
-  priv->reg_request = TRUE;
-  priv->registered = FALSE;
-+  priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;
-   priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, 
-                                      (GSourceFunc)register_network_cb, 
-                                      dialer);
-@@ -424,14 +422,14 @@
-   g_return_if_fail (MOKO_IS_DIALER (dialer));
-   priv = dialer->priv;
- 
-+  g_warning ("on_network_registered: type is %d\n", type);
-+
-   switch (type)
-   {
-     case MOKO_GSMD_CONNECTION_NETREG_NONE:
-     case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
-       /* Do nothing */
-       g_print ("NetReg: Searching for network\n");
-      g_source_remove (priv->reg_timeout);
-      priv->registered = TRUE;
-       break;
-     case MOKO_GSMD_CONNECTION_NETREG_DENIED:
-       /* This may be a pin issue*/
-@@ -441,11 +439,12 @@
-       g_print ("NetReg: Network registered\n");
-       g_print("\tLocationAreaCode = %x\n\tCellID = %x\n", lac, cell);
-       g_source_remove (priv->reg_timeout);
-      priv->registered = TRUE;
-       break;
-     default:
-       g_warning ("Unhandled register event type = %d\n", type);
-    };
-+
-+  priv->registered = type;
- }
- 
- static void
-@@ -619,28 +618,32 @@
-   g_return_val_if_fail (MOKO_DIALER (dialer), TRUE);
-   priv = MOKO_DIALER_GET_PRIVATE (dialer);
- 
-  if (!priv->reg_request)
-+  /* We check whether we've been registered yet, otherwise keep poking 
-+   * gsmd
-+   */
-+  switch (priv->registered)
-   {
-    /* We have yet to request registration, so lets do it */
-    /* FIXME: do the pin stuff */
-    g_print ("Requesting registration\n");
-    moko_gsmd_connection_network_register (priv->connection);
-  }
-  else 
-  {
-    /* We check whether we've been registered yet, otherwise keep poking 
-     * gsmd
-     */
-    if (priv->registered)
-    {
-      g_print ("Network Registered\n");
-      return FALSE;
-    }
-    else
-    {
-+    case MOKO_GSMD_CONNECTION_NETREG_NONE:
-+      /* We have yet to request registration, so lets do it */
-+      /* FIXME: do the pin stuff */
-       g_print ("Requesting registration\n");
-       moko_gsmd_connection_network_register (priv->connection);
-    }
-+      priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING;
-+      break;
-+    case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
-+      g_print ("Waiting for registration\n");
-+      break;
-+    case MOKO_GSMD_CONNECTION_NETREG_DENIED:
-+      g_print ("Registration denied, retrying\n");
-+      moko_gsmd_connection_network_register (priv->connection);
-+      priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING;
-+      break;
-+    case MOKO_GSMD_CONNECTION_NETREG_HOME:
-+    case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
-+      g_print ("Network Registered\n");
-+       return FALSE;
-+    default:
-+      g_warning ("Unhandled register event type = %d\n", priv->registered);
-   }
-   
-   return TRUE;
-@@ -754,9 +757,8 @@
- 
-   /* Handle network registration a few seconds after powering up the 
-    * antenna*/ 
-  priv->reg_request = TRUE;
-  priv->registered = FALSE;
-  priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, 
-+  priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;
-+  priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT * 2, 
-                                      (GSourceFunc)register_network_cb, 
-                                      dialer);
-   
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
deleted file mode 100644
index fa76c44a14..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "The Openmoko Dialer"
-SECTION = "openmoko/pim"
-DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r8"
-PE = "1"
-inherit openmoko2
-SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1"
-SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1"
-EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
-FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
deleted file mode 100644
index c97980eee1..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
-SECTION = "openmoko/base"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-PACKAGE_ARCH = "all"
-inherit openmoko2
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
-S = "${WORKDIR}/icons"
-PACKAGES += "${PN}-compat"
-FILES_${PN} = "${datadir}/icons/openmoko-standard"
-FILES_${PN}-compat = "${datadir}/icons/hicolor"
-do_install_append () {
-        mkdir --parents "${D}/${datadir}/icons/hicolor"
-        cd "${D}/${datadir}/icons/openmoko-standard"
-        FILES=`find . -type f -name moko\* -o -name openmoko*`
-        cd ../hicolor
-        for F in $FILES; do
-                mkdir --parents `dirname $F`
-                ln -s ${datadir}/icons/openmoko-standard/$F $F
-        done
-}
-pkg_postinst_${PN} () {
-    if [ "x$D" != "x" ]; then
-        exit 1
-    fi
-    gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
-}
-pkg_postinst_${PN}-compat () {
-    if [ "x$D" != "x" ]; then
-        exit 1
-    fi
-    gtk-update-icon-cache -q /usr/share/icons/hicolor
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
deleted file mode 100644
index fb46f1de55..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
-SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
-PR = "r2"
-inherit openmoko-base autotools
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/OM-2007.2/artwork;module=icons;proto=http"
-S = "${WORKDIR}/icons"
-PACKAGE_ARCH = "all"
-pkg_postinst_${PN} () {
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-        gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-libs.inc b/meta-openmoko/packages/openmoko2/openmoko-libs.inc
deleted file mode 100644
index 13a9d8d62f..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-libs.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-HOMEPAGE = "http://www.openmoko.org"
-LICENSE = "GPL"
-PV = "0.0.1+svn${SRCDATE}"
-inherit autotools pkgconfig
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/libraries;module=${REAL_PN};proto=http"
-S = "${WORKDIR}/${PN}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
deleted file mode 100644
index 118c510f17..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "A media player for Openmoko"
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 expat gstreamer libspiff curl tslib"
-RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r4"
-inherit openmoko2
-FILES_${PN} += "${datadir}/openmoko-mediaplayer"
-do_install_append() {
-        install -d ${D}${sysconfdir}/gconf/schemas
-        install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas
-}
-pkg_postinst_openmoko-mediaplayer2 () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb
deleted file mode 100644
index f28f7f8e0a..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "The Openmoko Message application"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
-inherit openmoko2
-EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
-FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb
deleted file mode 100644
index e8a5bc877d..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
-DEPENDS = "libmokogsmd2 libnotify"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r2"
-inherit openmoko-panel-plugin
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
deleted file mode 100644
index b944e79b45..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "The Openmoko Sample Project"
-SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2 intltool gconf"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r0"
-inherit openmoko2
-PACKAGES += "${PN}-src"
-# path should match the toolchain path
-FILES_${PN}-src = "/usr/local/openmoko"
-PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
-do_configure_prepend() {
-        install -d ${WORKDIR}/source
-        cp -pPR ${S} ${WORKDIR}/source/
-        find ${WORKDIR}/source -name ".svn"|xargs rm -rf
-}
-do_install_append() {
-        install -d ${D}/usr/local/openmoko/source/
-        cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2.bb b/meta-openmoko/packages/openmoko2/openmoko-session2.bb
deleted file mode 100644
index d0c3268e0c..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "Custom Matchbox session files for Openmoko"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
-RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r69"
-SRC_URI = "\
-  file://etc \
-  file://matchbox-session \
-"
-S = "${WORKDIR}"
-inherit update-alternatives
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
-        install -d ${D}${sysconfdir}
-        cp -R ${S}/etc/* ${D}${sysconfdir}
-        rm -fR ${D}${sysconfdir}/.svn
-        rm -fR ${D}${sysconfdir}/matchbox/.svn
-        chmod -R 755 ${D}${sysconfdir}/
-}
-PACKAGE_ARCH = "all"
-pkg_postinst_openmoko-session2 () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
-# gstreamer audio settings
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
-}
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "11"
-CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
deleted file mode 100755
index 732cce9d3f..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-SHOWCURSOR="no"
-openmoko-today &
-phone-kit &
-matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ &
-matchbox-panel-2 --start-applets systray,startup \
-  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar &
-exec neod
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
deleted file mode 100755
index 65f1ce72ca..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Very simple session manager for matchbox tools
-#
-# Uncomment below to enable parsing of debian menu entrys
-# export MB_USE_DEB_MENUS=1 
-if [ -e $HOME/.matchbox/session ]
-then
-exec $HOME/.matchbox/session
-fi
-if [ -e /etc/matchbox/session ]
-then
-exec /etc/matchbox/session
-fi
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist. 
-matchbox-desktop &
-matchbox-panel  --orientation south &
-exec matchbox-window-manager $@
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
deleted file mode 100755
index 964947376e..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# pulseaudio    This shell script starts and stops pulseaudio.
-#
-# chkconfig: 345 90 40
-# description: Pulseaudio manages the sound input/output
-# processname: pulseaudio
-# Source function library.
-#. /etc/rc.d/init.d/functions
-RETVAL=0
-prog="pulseaudio"
-start() {
-    echo -n "Starting audio server: "
-    # FIXME once alsa/shm permissions have been fixed, supply --system
-    start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session
-    if [ $? = 0 ]; then
-        echo "$prog (warning ignores)." # FIXME remove comment on warning
-    else
-        echo "(failed.)"
-    fi
-}
-stop() {
-    echo -n "Stopping audio server: "
-    start-stop-daemon -K -x /usr/bin/pulseaudio
-    echo "pulseaudio."
-}
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart|reload)
-        stop
-        start
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-esac
-exit $RETVAL
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session
deleted file mode 100644
index 7ba07e9784..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-# Create autoload entries for the device drivers
-add-autoload-sink output module-alsa-sink sink_name=output
-add-autoload-source input module-alsa-source source_name=input
-# Load several protocols
-load-module module-esound-protocol-unix
-load-module module-simple-protocol-tcp
-load-module module-native-protocol-unix
-load-module module-cli-protocol-unix
-# Make some devices default
-set-default-sink output
-set-default-source input
-# Don't fail if the audio files referred to below don't exist
-.nofail
-# Load an audio to the sample cache for usage with module-x11-bell
-load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
-load-module module-x11-bell sample=x11-bell
-# Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
-load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
-load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
deleted file mode 100644
index 33cd5648d4..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Openmoko Sound System"
-SECTION = "openmoko/base"
-RDEPENDS = "\
-  pulseaudio-server \
-  pulseaudio-module-alsa-sink \
-  pulseaudio-module-alsa-source \
-  pulseaudio-module-cli \
-  pulseaudio-module-esound-protocol-unix \
-  pulseaudio-module-simple-protocol-tcp \
-  pulseaudio-module-native-protocol-unix \
-  pulseaudio-module-cli-protocol-unix \
-  gst-plugin-pulse \
-"
-RREPLACES = "openmoko-sound-system"
-RPROVIDES = "openmoko-sound-system"
-PR = "r5"
-inherit openmoko-base update-rc.d
-INITSCRIPT_NAME = "pulseaudio"
-INITSCRIPT_PARAMS = "defaults 35"
-SRC_URI = "file://pulseaudio \
-           file://session"
-S = "${WORKDIR}"
-do_install() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
-    install -d ${D}/${sysconfdir}/pulse
-        install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
-}
-PACKAGE_ARCH = "all"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
deleted file mode 100644
index 3096da4813..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Standard sound theme for the Openmoko framework"
-SECTION = "openmoko/base"
-RREPLACES = "openmoko-sound-theme-standard"
-RPROVIDES = "openmoko-sound-theme-standard"
-PV = "0.1+svnr${SRCREV}"
-PR = "r3"
-inherit openmoko2 autotools
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
-S = "${WORKDIR}/sounds"
-do_install() {
-        find ${WORKDIR} -name ".svn" | xargs rm -rf
-        install -d ${D}${datadir}/openmoko/sounds
-        for i in *.mp3; do
-                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
-        done
-        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
-                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
-        done
-}
-FILES_${PN} = "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
deleted file mode 100644
index f9e813a734..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Tasks
-Comment=What you need to do
-Exec=tasks
-Icon=openmoko-tasks
-Terminal=false
-Type=Application
-Categories=GTK;Application;PIM;Office
-MimeType=text/x-vcard;
-SingleInstance=true
-StartupNotify=true
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
deleted file mode 100644
index f28d1ade99..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
+++ /dev/null
Binary files differ
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
deleted file mode 100644
index b18c269814..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "The Openmoko Agenda"
-SECTION = "openmoko/pim"
-DEPENDS = "dbus-glib eds-dbus libmokoui2"
-RDEPENDS = "libedata-cal"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
-inherit openmoko2
-SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http \
-           file://openmoko-tasks.desktop \
-           file://openmoko-tasks.png"
-S = "${WORKDIR}/trunk"
-EXTRA_OECONF = "--enable-omoko --disable-gtk"
-do_install_append() {
-        install -d ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/openmoko-tasks.desktop ${D}${datadir}/applications/tasks.desktop
-        install -d ${D}${datadir}/pixmaps
-        install -m 0644 ${WORKDIR}/openmoko-tasks.png ${D}${datadir}/pixmaps
-}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
deleted file mode 100644
index 699691925c..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "The Openmoko Command Line Terminal"
-SECTION = "openmoko/applications"
-DEPENDS = "vala-native vte libmokoui2"
-RDEPENDS = "liberation-fonts"
-PV = "3.0.0+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
deleted file mode 100644
index d4d23d11d6..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
-SECTION = "openmoko/base"
-RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.1+svnr${SRCREV}"
-PR = "r5"
-inherit openmoko2
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
-S = "${WORKDIR}/openmoko-standard-2"
-do_install() {
-        find ${WORKDIR} -name ".svn" | xargs rm -rf
-        install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
-        cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
-        rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
-        
-}
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
deleted file mode 100644
index 94b9c45e7c..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Today2 vfolder files"
-SECTION = "openmoko/misc"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r4"
-RCONFLICTS_${PN} = "matchbox-desktop-sato"
-inherit openmoko2
-FILES_${PN} += "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
deleted file mode 100644
index efd281a95e..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "The Openmoko Application Launcher"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
-RDEPENDS = "libedata-cal openmoko-today2-folders"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-inherit openmoko2 gtk-icon-cache 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
deleted file mode 100644
index 5b3956ee23..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "A World-Clock for Openmoko"
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 libjana"
-PV = "0.1.0+svnr${SRCREV}"
-inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko.inc b/meta-openmoko/packages/openmoko2/openmoko.inc
deleted file mode 100644
index d5462be530..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-HOMEPAGE = "http://www.openmoko.org"
-LICENSE = "GPL"
-DEPENDS = "gtk+ eds-dbus"
-PV = "0.0.1+svn${SRCDATE}"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=${REAL_PN};proto=http"
-S = "${WORKDIR}/${REAL_PN}"
-inherit autotools
diff --git a/meta-openmoko/packages/usbpath/usbpath-native_svn.bb b/meta-openmoko/packages/usbpath/usbpath-native_svn.bb
deleted file mode 100644
index 7389e161c4..0000000000
--- a/meta-openmoko/packages/usbpath/usbpath-native_svn.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require usbpath_svn.bb
-inherit native
-DEPENDS = "libusb-native"
diff --git a/meta-openmoko/packages/usbpath/usbpath_svn.bb b/meta-openmoko/packages/usbpath/usbpath_svn.bb
deleted file mode 100644
index 0c0873ffe1..0000000000
--- a/meta-openmoko/packages/usbpath/usbpath_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Convert the physical locations of a USB device to/from its number"
-AUTHOR = "Werner Almesberger <werner@openmoko.org>"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "libusb"
-PV = "0.0+svnr${SRCREV}"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;proto=http"
-S = "${WORKDIR}/usbpath"
-inherit autotools
diff --git a/meta-openmoko/packages/vala/vala-native_0.1.5.bb b/meta-openmoko/packages/vala/vala-native_0.1.5.bb
deleted file mode 100644
index f097e7db74..0000000000
--- a/meta-openmoko/packages/vala/vala-native_0.1.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require vala_${PV}.bb
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/meta-openmoko/packages/vala/vala_0.1.5.bb b/meta-openmoko/packages/vala/vala_0.1.5.bb
deleted file mode 100644
index b83d19650a..0000000000
--- a/meta-openmoko/packages/vala/vala_0.1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. Vala compiles to C"
-SECTION = "devel"
-DEPENDS = "glib-2.0"
-HOMEPAGE = "http://live.gnome.org/Vala"
-LICENSE = "LGPL"
-SRC_URI = "http://download.gnome.org/sources/vala/0.1/vala-${PV}.tar.bz2"
-S = "${WORKDIR}/vala-${PV}"
-inherit autotools lib_package