merge of 4daf34d7b97dde040c825249e39abc6af0abf493

     and 7f6d02bad0d27e0bd6a0d6e493318b5275142389

5 files changed, 169 insertions, 152 deletions

diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index dba7915f26..72f1a8b36f 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -1,154 +1,14 @@
-DESCRIPTION = "Meta-package for Opie and QPE"
+DESCRIPTION = "Meta-package for QPE stuff"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-DEPENDS = "meta-opie"
-PR = "r2"
+DEPENDS = "task-qpe"
+PR = "r3"
 
-PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
+BUILD_ALL_DEPS = 1
+
+RDEPENDS = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
 	task-qpe-fonts task-qpe-settings"
 
-RDEPENDS_task-qpe-applets = "\
-    subapplet \
-    tasklistapplet"
-
-RDEPENDS_task-qpe-applications = "\
-    camera-assistant \
-    cumulus \
-    dviviewer \
-    inkwp \
-    iqnotes \
-    justreader \
-    keyring \
-    klimt \
-    kstars-embedded \
-    ktimetrackerpi \
-    mileage \
-    militaryalphabet \
-    notez \
-    petitepainture \
-    pocketcellar \
-    poqetpresenter \
-    portabase \
-    qpdf2 \
-    qpealarmclock \
-    qpe-gaim \
-    qpegps \
-    qpenmapfe \
-    qplot \
-    resistorui \
-    shopper \
-    timesleuth \
-    txdrug \
-    tximage \
-    ubahnnav \
-    visiscript \
-    zeecookbook \
-    zbedic \
-    zbench \
-    zgscore \
-    zipsc \
-    zlapspeed \
-    zroadmap \
-    zshopi"
-
-RDEPENDS_task-opie-decorations = "\
-    opie-deco-flat \
-    opie-deco-liquid \
-    opie-deco-polished"
-
-RDEPENDS_task-qpe-games = "\
-    aliens \
-    aliens-qt \
-    atomic \
-    billiardz \
-    brickout \
-    checkers \
-    crossword \
-    fish \
-    froot \
-    gemdropx \
-    glider \
-    gnuz \
-    hexatrolic \
-    iaimaster \
-    icebloxx \
-    knights \
-    labyrinth \
-    mahjongg \
-    maki \
-    nmm \
-    pairs \
-    pdamaze \
-    pipeman \
-    powermanga \
-    puzz-le \
-    qfish2 \
-    qpe-vexed \
-    qmatrix \
-    shisensho \
-    sokoban \
-    tickypip \
-    tickypip-levels \
-    tron \
-    vectoroids \
-    win4 \
-    zauralign \
-    zddice \
-    ziq \
-    zmerlin \
-    zrally \
-    zrev7 \
-    zsubhunt \
-    ztappy"
-
-RDEPENDS_task-qpe-inputmethods = "\
-    custominput \
-    flexis-zaurus \
-    irk \
-    irk-belkin"
-
-RDEPENDS_task-qpe-multimedia = "\
-    mplayer \
-    sidplayer \
-    xmms-embedded"
-
-RDEPENDS_task-kdepim = "\
-    kopi \
-    kapi \
-    kopi-applet"
-
-DEPENDS += " kdepimpi"
-
-RDEPENDS_task-qpe-emulators = "\
-    scummvm \
-    snes9x-sdl-qpe"
-
-
-task-qpe-fonts = "\
-    qpf-bitstream-vera \
-    qpf-bitstream-vera-sans-mono \
-    qpf-dejavusans \
-    qpf-dejavusanscondensed \
-    qpf-dejavusansmono \
-    qpf-dejavuserif \
-    qpf-dejavuserifcondensed \
-    qpf-freemono \
-    qpf-freeserif \
-    qpf-gentium \
-    qpf-gentiumalt \
-    qpf-hunkysans \
-    qpf-hunkyserif \
-    qpf-qte \
-    qpf-helvetica \
-    qpf-unifont \
-    qpf-utopia \
-    terminus"
-#FIXME Does this really want just a DEPENDS here?
-DEPENDS += " ${task-qpe-fonts}"
-
-RDEPENDS_task-qpe-settings += "\
-    qclockchange"
-
diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb
index 76fa01f069..9d0f2163bf 100644
--- a/packages/meta/meta-sdl.bb
+++ b/packages/meta/meta-sdl.bb
@@ -1,15 +1,14 @@
 DESCRIPTION = "Meta-package for SDL"
 LICENSE = MIT
-PACKAGES = "task-sdl-libs task-sdl-base task-sdl-games task-sdl-emulators"
-PR = "r1"
+RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
+PR = "r2"
 
 ALLOW_EMPTY = 1
+BUILD_ALL_DEPS = 1
 
 # no need to add libsdl as all libsdl-* already rdepend on it
 RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net"
 
-RDEPENDS_task-sdl-base = ""
-
 RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
 
 RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"
diff --git a/packages/meta/sdl-image.bb b/packages/meta/sdl-image.bb
index 2b711f1c10..0f3254b56e 100644
--- a/packages/meta/sdl-image.bb
+++ b/packages/meta/sdl-image.bb
@@ -1,8 +1,9 @@
+LICENSE = MIT
+
 export IMAGE_BASENAME = "sdl-image"
 
-DEPENDS = "task-bootstrap meta-sdl"
+DEPENDS = "task-bootstrap task-sdl"
 
 export IPKG_INSTALL = "task-bootstrap sdl-base"
 
 inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/task-qpe.bb b/packages/meta/task-qpe.bb
new file mode 100644
index 0000000000..6f03d307eb
--- /dev/null
+++ b/packages/meta/task-qpe.bb
@@ -0,0 +1,146 @@
+DESCRIPTION = "Tasks for QPE stuff"
+SECTION = "opie/base"
+ALLOW_EMPTY = 1
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PR = "r2"
+
+PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
+	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
+	task-qpe-fonts task-qpe-settings"
+
+RDEPENDS_task-qpe-applets = "\
+    subapplet \
+    tasklistapplet"
+
+RDEPENDS_task-qpe-applications = "\
+    camera-assistant \
+    cumulus \
+    dviviewer \
+    inkwp \
+    iqnotes \
+    justreader \
+    keyring \
+    klimt \
+    kstars-embedded \
+    ktimetrackerpi \
+    mileage \
+    militaryalphabet \
+    notez \
+    petitepainture \
+    pocketcellar \
+    poqetpresenter \
+    portabase \
+    qpdf2 \
+    qpealarmclock \
+    qpe-gaim \
+    qpegps \
+    qpenmapfe \
+    qplot \
+    resistorui \
+    shopper \
+    timesleuth \
+    txdrug \
+    tximage \
+    ubahnnav \
+    visiscript \
+    zeecookbook \
+    zbedic \
+    zbench \
+    zgscore \
+    zipsc \
+    zlapspeed \
+    zroadmap \
+    zshopi"
+
+RDEPENDS_task-opie-decorations = "\
+    opie-deco-flat \
+    opie-deco-liquid \
+    opie-deco-polished"
+
+RDEPENDS_task-qpe-games = "\
+    aliens \
+    aliens-qt \
+    atomic \
+    billiardz \
+    brickout \
+    checkers \
+    crossword \
+    fish \
+    froot \
+    gemdropx \
+    glider \
+    gnuz \
+    hexatrolic \
+    iaimaster \
+    icebloxx \
+    knights \
+    labyrinth \
+    mahjongg \
+    maki \
+    nmm \
+    pairs \
+    pdamaze \
+    pipeman \
+    powermanga \
+    puzz-le \
+    qfish2 \
+    qpe-vexed \
+    qmatrix \
+    shisensho \
+    sokoban \
+    tickypip \
+    tickypip-levels \
+    tron \
+    vectoroids \
+    win4 \
+    zauralign \
+    zddice \
+    ziq \
+    zmerlin \
+    zrally \
+    zrev7 \
+    zsubhunt \
+    ztappy"
+
+RDEPENDS_task-qpe-inputmethods = "\
+    custominput \
+    flexis-zaurus \
+    irk \
+    irk-belkin"
+
+RDEPENDS_task-qpe-multimedia = "\
+    mplayer \
+    sidplayer \
+    xmms-embedded"
+
+RDEPENDS_task-kdepim = "\
+    kopi \
+    kapi \
+    kopi-applet"
+
+RDEPENDS_task-qpe-emulators = "scummvm"
+
+RDEPENDS_task-qpe-fonts = "\
+    qpf-bitstream-vera \
+    qpf-bitstream-vera-sans-mono \
+    qpf-dejavusans \
+    qpf-dejavusanscondensed \
+    qpf-dejavusansmono \
+    qpf-dejavuserif \
+    qpf-dejavuserifcondensed \
+    qpf-freemono \
+    qpf-freeserif \
+    qpf-gentium \
+    qpf-gentiumalt \
+    qpf-hunkysans \
+    qpf-hunkyserif \
+    qpf-qte \
+    qpf-helvetica \
+    qpf-unifont \
+    qpf-utopia \
+    terminus"
+
+RDEPENDS_task-qpe-settings += "\
+    qclockchange"
+
diff --git a/packages/meta/task-sdl.bb b/packages/meta/task-sdl.bb
new file mode 100644
index 0000000000..046283f28f
--- /dev/null
+++ b/packages/meta/task-sdl.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Tasks for SDL stuff"
+LICENSE = MIT
+PACKAGES = "task-sdl-libs task-sdl-games task-sdl-emulators"
+
+# no need to add libsdl as all libsdl-* already rdepend on it
+RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net"
+
+RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
+
+RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"
+