11 files changed, 156 insertions, 132 deletions
diff --git a/packages/angstrom/angstrom-gpe-task-apps.bb b/packages/angstrom/angstrom-gpe-task-apps.bb
new file mode 100644
index 0000000000..37a6ed98c3
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-apps.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS = "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
+    gpe-soundbite \
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
+    gpe-scap \
+    gpe-windowlist"
+
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
new file mode 100644
index 0000000000..c931d9d1e4
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS = "\
+    matchbox \
+    matchbox-panel-hacks \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gpe-terminal \
+    matchbox-keyboard \
+    gpe-theme-clearlooks \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc \
+    ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \
+    "
+
diff --git a/packages/angstrom/angstrom-gpe-task-game.bb b/packages/angstrom/angstrom-gpe-task-game.bb
new file mode 100644
index 0000000000..09a47f6a26
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-game.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+#    xdemineur \
+"
diff --git a/packages/angstrom/angstrom-gpe-task-pim.bb b/packages/angstrom/angstrom-gpe-task-pim.bb
new file mode 100644
index 0000000000..8e9d0d4f31
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-pim.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-contacts \
+    gpesyncd"
+
+
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
new file mode 100644
index 0000000000..c79c068cbd
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    matchbox-panel-manager \
+    gpe-su \
+    gpe-conf \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    minimix \
+    xmonobut"
diff --git a/packages/angstrom/angstrom-ohand-task-pim.bb b/packages/angstrom/angstrom-ohand-task-pim.bb
new file mode 100644
index 0000000000..70d52c922f
--- /dev/null
+++ b/packages/angstrom/angstrom-ohand-task-pim.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    dates \
+    contacts \
+    tasks \
+"
+
diff --git a/packages/angstrom/angstrom-task-office.bb b/packages/angstrom/angstrom-task-office.bb
new file mode 100644
index 0000000000..364924995a
--- /dev/null
+++ b/packages/angstrom/angstrom-task-office.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gnumeric \
+    abiword \
+    imposter \
+    evince \
+    gqview"
+
diff --git a/packages/angstrom/angstrom-task-printing.bb b/packages/angstrom/angstrom-task-printing.bb
new file mode 100644
index 0000000000..2954667192
--- /dev/null
+++ b/packages/angstrom/angstrom-task-printing.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    cups \
+#    gnome-cups-manager \
+    "
diff --git a/packages/angstrom/angstrom-task-sectest.bb b/packages/angstrom/angstrom-task-sectest.bb
new file mode 100644
index 0000000000..3142f280f3
--- /dev/null
+++ b/packages/angstrom/angstrom-task-sectest.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+#    dsniff \
+    prismstumbler \
+#    tcpdump \
+    kismet \
+    hydra \
+#    thcrut \
+#    driftnet \
+    miniclipboard"
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
new file mode 100644
index 0000000000..c05d9a36db
--- /dev/null
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    virtual/libx11 \
+    virtual/xserver \
+    ttf-dejavu-sans \
+    ttf-dejavu-sans-mono \
+    "
+
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
deleted file mode 100644
index a5f9be1938..0000000000
--- a/packages/angstrom/task-angstrom-x11.bb
+++ /dev/null
@@ -1,132 +0,0 @@
-DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r30"
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PACKAGES = "\
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    angstrom-gpe-task-pim \
-    angstrom-gpe-task-apps \
-    angstrom-gpe-task-games \
-    angstrom-ohand-task-pim \
-    angstrom-task-office \
-    angstrom-task-printing \
-    angstrom-task-sectest"
-
-RDEPENDS_angstrom-x11-base-depends := "\
-    virtual/libx11 \
-    virtual/xserver \
-    ttf-dejavu-sans \
-    ttf-dejavu-sans-mono \
-    "
-
-RDEPENDS_angstrom-gpe-task-base := "\
-    matchbox \
-    matchbox-panel-hacks \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gpe-terminal \
-    matchbox-keyboard \
-    gpe-theme-clearlooks \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
-    suspend-desktop \
-    teleport \
-    xauth \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc \
-    ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \
-    "
-
-RDEPENDS_angstrom-gpe-task-pim := "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-contacts \
-    gpesyncd"
-
-RDEPENDS_angstrom-ohand-task-pim := "\
-    dates \
-    contacts \
-    tasks \
-"
-
-RDEPENDS_angstrom-gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-su \
-    gpe-conf \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    minimix \
-    xmonobut"
-
-RDEPENDS_angstrom-gpe-task-apps := "\
-    gpe-edit \
-    gpe-gallery \
-    gpe-calculator \
-    gpe-clock \
-    gpe-plucker \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
-    gpe-soundbite \
-    ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
-    gpe-scap \
-    gpe-windowlist"
-
-RDEPENDS_angstrom-gpe-task-games := "\
-    gpe-go \
-    gpe-lights \
-    gpe-othello \
-    gpe-tetris \
-    gsoko \
-#    xdemineur \
-"
-
-RDEPENDS_angstrom-task-office := "\
-    gnumeric \
-    abiword \
-    imposter \
-    evince \
-    gqview"
-
-RDEPENDS_angstrom-task-printing := "\
-    cups \
-#    gnome-cups-manager \
-    "
-
-RDEPENDS_angstrom-task-sectest := "\
-    nmap \
-    ettercap \
-    stunnel \
-    curl \
-#    dsniff \
-    prismstumbler \
-#    tcpdump \
-    kismet \
-    hydra \
-#    thcrut \
-#    driftnet \
-    miniclipboard"