11 files changed, 39 insertions, 29 deletions
diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb
index 5aee575b75..058a3fd6b1 100644
--- a/packages/tasks/task-gpe-apps.bb
+++ b/packages/tasks/task-gpe-apps.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Application task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
index 4b9a64927a..a26c2118e4 100644
--- a/packages/tasks/task-gpe-base.bb
+++ b/packages/tasks/task-gpe-base.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Base task package for GPE Palmtop Environment"
 PR = "r8"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb
index 678afb8c1a..7babc03c56 100644
--- a/packages/tasks/task-gpe-connectivity.bb
+++ b/packages/tasks/task-gpe-connectivity.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-mini-browser \
     gpe-irc"
 
diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb
index 346cd70353..25c055f446 100644
--- a/packages/tasks/task-gpe-desktopapps.bb
+++ b/packages/tasks/task-gpe-desktopapps.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     sylpheed \
     firefox \
     thunderbird \
diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb
index 6076f5ba70..335f64031e 100644
--- a/packages/tasks/task-gpe-games.bb
+++ b/packages/tasks/task-gpe-games.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Games task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb
index 5a49af473d..c6e6c22e6c 100644
--- a/packages/tasks/task-gpe-pim.bb
+++ b/packages/tasks/task-gpe-pim.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
 PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-timesheet \
     gpe-todo \
     gpe-calendar \
diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb
index 75b525b618..b647c6136b 100644
--- a/packages/tasks/task-gpe-sectest.bb
+++ b/packages/tasks/task-gpe-sectest.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     nmap \
     ettercap \
     stunnel \
diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb
index ddfcb282f1..84302fdf5a 100644
--- a/packages/tasks/task-gpe-settings.bb
+++ b/packages/tasks/task-gpe-settings.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Settings task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-mininet \
     gpe-bluetooth \
     gpe-beam \
diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb
index 247165ba9d..674dd86224 100644
--- a/packages/tasks/task-gpe-web.bb
+++ b/packages/tasks/task-gpe-web.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     pidgin \
     minimo"
 
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index 5399c12025..bbb3857b3b 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r4"
+PR = "r5"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
+
+inherit task
 
 PACKAGES = "\
     gpe-base-depends \
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index f2a108b712..e0298ae8d7 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r8"
+PR = "r9"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
+
+inherit task
 
 PACKAGES = "\
     gpephone-task-base \