10 files changed, 51 insertions, 13 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index b5b3e82f70..15835508aa 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r60"
+PR = "r63"
 
 inherit task
 
@@ -345,6 +345,8 @@ RRECOMMENDS_task-base-wifi = "\
     kernel-module-ieee80211-crypt-wep \
     kernel-module-ecb \
     kernel-module-arc4 \
+    kernel-module-crypto_algapi \
+    kernel-module-cryptomgr \
     kernel-module-michael-mic \
     kernel-module-aes"
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
index 9da765ee94..f2d25e32ac 100644
--- a/packages/tasks/task-devimage.bb
+++ b/packages/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-PR = "r2"
+PR = "r4"
 LICENSE = "MIT"
 
 inherit task
@@ -19,8 +19,10 @@ RDEPENDS = "\
     "
 
 RRECOMMENDS = "\
+    kernel-image \
     kernel-module-msdos \
     kernel-module-vfat \
     kernel-modules \
     ${DEVIMAGE_EXTRA_RRECOMMENDS} \
     "
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/tasks/task-java-gtk.bb b/packages/tasks/task-java-gtk.bb
new file mode 100644
index 0000000000..b4f75920f3
--- /dev/null
+++ b/packages/tasks/task-java-gtk.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Task package for Java GTK applications"
+PR = "r0"
+LICENSE = "MIT"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+    classpath-awt \
+    librxtx-java \
+    librxtx-jni \
+    libswt3.4-gtk-java \
+    logic-analyzer \
+ "
diff --git a/packages/tasks/task-java.bb b/packages/tasks/task-java.bb
index bfe6f56db8..be94662d40 100644
--- a/packages/tasks/task-java.bb
+++ b/packages/tasks/task-java.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Base task package for Java"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit task
@@ -9,5 +9,4 @@ RDEPENDS_${PN} = "\
     classpath-awt \
     java2-runtime \
     librxtx-java \
-    logic-analyzer \
  "
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index a5d13e7e08..310d3f07c3 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -12,10 +12,11 @@ DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, App
 RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
   matchbox-panel-2-applets \
-  matchbox-keyboard-inputmethod \
-  matchbox-keyboard-im \
-  matchbox-keyboard-applet \
+#  matchbox-keyboard-inputmethod \
+#  matchbox-keyboard-im \
+#  matchbox-keyboard-applet \
   matchbox-stroke \
+  multitap-pad \
   openmoko-terminal2 \
 #  openmoko-keyboard \
   openmoko-panel-battery \
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index 49e4e66859..474efff79d 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r72"
+PR = "r73"
 
 inherit task
 
@@ -14,5 +14,6 @@ RDEPENDS_task-openmoko-phone = "\
   libgsmd-tools \
   openmoko-dialer2 \
   openmoko-panel-gsm \
+  openmoko-panel-memory \
 #  ppp \
 "
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
index 695c380bc6..a5baed0024 100644
--- a/packages/tasks/task-openmoko-python-devel.bb
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "OpenMoko: Python Development Tools"
 SECTION = "openmoko/devel"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 inherit task
 
 RDEPENDS_task-openmoko-python-devel = "\
-  python-efl \
+  task-python-efl \
   python-pygtk \
   python-lightmediascanner \
 "
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 4666b4ab8d..5487985fd4 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -50,8 +50,7 @@ RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-butto
                       opie-formatter opie-language opie-launcher-settings \
                       opie-light-and-power opie-mediummount opie-networksettings \
                       opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
-                      opie-systemtime opie-usermanager opie-icon-reload \
-                      opie-vmemo-settings"
+                      opie-systemtime opie-icon-reload opie-vmemo-settings"
 
 RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
                  opie-mail opie-pimconverter"
diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb
new file mode 100644
index 0000000000..e78a4cabae
--- /dev/null
+++ b/packages/tasks/task-python-efl-examples.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+RDEPENDS = "\
+  task-python-efl \
+  python-ecore-examples \
+  python-emotion-examples \
+  python-edje-examples \
+  python-epsilon-examples \
+  python-math python-textutils \
+"
+PR = "ml3"
+
+ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-efl.bb b/packages/tasks/task-python-efl.bb
new file mode 100644
index 0000000000..1c7f23a1eb
--- /dev/null
+++ b/packages/tasks/task-python-efl.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon python-edbus"
+PR = "ml2"
+
+ALLOW_EMPTY = "1"