merge of '0f116f3500c10a0c6df76297f3ab887bebb2d8ad'

     and 'dce598404f82b5e5bef1adc1cc1d91fbfc2aecc2'

12 files changed, 190 insertions, 31 deletions

diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb
index 2f0bef98ef..acd45cd5ae 100644
--- a/packages/images/e-image.bb
+++ b/packages/images/e-image.bb
@@ -1,15 +1,15 @@
 require e-image-core.bb
 DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-PR = "r5"
+PR = "r6"
 
 export IMAGE_BASENAME = "e-image"
 export PACKAGE_INSTALL += "task-e-x11-core \
-                        gpe-task-pim \
-                        gpe-task-settings \
-                        gpe-task-apps \
-                        gpe-task-connectivity \
-                        gpe-task-games \
-                        gpe-task-apps-extra \
+                        ask-gpe-pim \
+                        task-gpe-settings \
+                        task-gpe-apps \
+                        task-gpe-connectivity \
+                        task-gpe-games \
+                        task-apps-extra \
                         figment \
                         xhost \
                         gpe-soundserver \
@@ -23,13 +23,8 @@ export PACKAGE_INSTALL += "task-e-x11-core \
                         gdk-pixbuf-loader-pnm \
                         gdk-pixbuf-loader-xbm \
                         gdk-pixbuf-loader-xpm"
-#                        gdk-pixbuf-loader-pcx \
-#                        gdk-pixbuf-loader-ico \
-#                        gdk-pixbuf-loader-ani \
-#                        gdk-pixbuf-loader-ras \
-#                        gdk-pixbuf-loader-tga \
-#                        gdk-pixbuf-loader-wbmp \
 
-DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth"
+DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \
+            figment xhost gpe-soundserver gpe-confd xauth"
 
 RDEPENDS = "${PACKAGE_INSTALL}"
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 552384c9e6..5a0632ff37 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -1,20 +1,20 @@
 
-PR = "r20"
+PR = "r21"
 
 export IMAGE_BASENAME = "gpe-image"
 
 GPE_EXTRA_THEMES = "gpe-theme-industrial"
 
 GPE_EXTRA_INSTALL_none = ""
-GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "task-gpe-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_smallscreen = "task-gpe-games ${GPE_EXTRA_THEMES}"
 
 GUI_MACHINE_CLASS ?= "none"
 GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 #ship more stuff with devices with >16MB of flash
 GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
-    gpe-task-connectivity \
+    task-gpe-connectivity \
     gpe-theme-clearlooks \
     figment \
 ",d)}'
@@ -23,15 +23,15 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe-base task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-games"
 RDEPENDS = "${PACKAGE_INSTALL}"
 
 export PACKAGE_INSTALL = "\
     ${MACHINE_TASK_PROVIDER} \
-    gpe-task-base \
-    gpe-task-pim \
-    gpe-task-settings \
-    gpe-task-apps \
+    task-gpe-base \
+    task-gpe-pim \
+    task-gpe-settings \
+    task-gpe-apps \
     ${XSERVER} \
     ${GPE_EXTRA_INSTALL}"
 
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index d6e199f6d6..15e9fd1911 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,14 +1,13 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 LICENSE = "MIT"
-PR = "r42"
+PR = "r43"
 
 RDEPENDS = "\
-    gpe-base-depends \
-    gpe-task-base \
-    gpe-task-settings \
-    gpe-task-pim \
-    gpe-task-apps \
-    gpe-task-games \
-    gpe-task-connectivity"
+    task-gpe-base \
+    task-gpe-settings \
+    task-gpe-pim \
+    task-gpe-apps \
+    task-gpe-games \
+    task-gpe-connectivity"
 
 inherit meta
diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb
new file mode 100644
index 0000000000..5aee575b75
--- /dev/null
+++ b/packages/tasks/task-gpe-apps.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Application task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    rosetta \
+    gpe-scap \
+    gpe-windowlist \
+    gpe-filemanager \
+    gpe-soundbite \
+    mbmerlin \
+    starling"
+
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
new file mode 100644
index 0000000000..821142949a
--- /dev/null
+++ b/packages/tasks/task-gpe-base.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Base task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    diet-x11 \
+    virtual/xserver \
+    gpe-bootsplash \
+    bluez-utils-dbus \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    startup-monitor \
+    libgtkstylus \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc \
+    ttf-dejavu-sans \
+    ttf-dejavu-sans-mono \
+    ttf-dejavu-serif"
+
diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb
new file mode 100644
index 0000000000..678afb8c1a
--- /dev/null
+++ b/packages/tasks/task-gpe-connectivity.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-mini-browser \
+    gpe-irc"
+
diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb
new file mode 100644
index 0000000000..346cd70353
--- /dev/null
+++ b/packages/tasks/task-gpe-desktopapps.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    sylpheed \
+    firefox \
+    thunderbird \
+    galculator \
+    gnumeric \
+    gpdf"
+
diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb
new file mode 100644
index 0000000000..6076f5ba70
--- /dev/null
+++ b/packages/tasks/task-gpe-games.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Games task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+    xdemineur"
+
diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb
new file mode 100644
index 0000000000..a81b5a9a34
--- /dev/null
+++ b/packages/tasks/task-gpe-pim.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_gpe-task-pim = "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-sketchbook \
+    gpe-contacts \
+    gpe-synctool \
+    gpesyncd \
+    miniclipboard"
+
+# broken    gpe-today \ 
+
+
diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb
new file mode 100644
index 0000000000..75b525b618
--- /dev/null
+++ b/packages/tasks/task-gpe-sectest.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+    dsniff \
+    prismstumbler \
+    tcpdump \
+    kismet \
+    hydra \
+    thcrut"
+
diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb
new file mode 100644
index 0000000000..ddfcb282f1
--- /dev/null
+++ b/packages/tasks/task-gpe-settings.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Settings task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-mininet \
+    gpe-bluetooth \
+    gpe-beam \
+    matchbox-panel-manager \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mixer \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    minimix \
+    xmonobut"
+
diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb
new file mode 100644
index 0000000000..247165ba9d
--- /dev/null
+++ b/packages/tasks/task-gpe-web.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+
+RDEPENDS = "\
+    pidgin \
+    minimo"
+