explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'

              and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
   using ancestor ''
        to branch 'org.openembedded.dev'

1 files changed, 130 insertions, 150 deletions

diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index 8b6a3df829..dba7915f26 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -10,165 +10,145 @@ 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"
 
-task-qpe-applets = "\
-subapplet \
-tasklistapplet \
-"
-RDEPENDS_task-qpe-applets = "${task-qpe-applets}"
-DEPENDS += " ${task-qpe-applets}"
+RDEPENDS_task-qpe-applets = "\
+    subapplet \
+    tasklistapplet"
 
-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-qpe-applications = "${task-qpe-applications}"
-DEPENDS += " ${task-qpe-applications}"
+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"
 
-task-opie-decorations = "\
-opie-deco-flat \
-opie-deco-liquid \
-opie-deco-polished "
-RDEPENDS_task-opie-decorations = "${task-opie-decorations}"
-DEPENDS += " ${task-opie-decorations}"
+RDEPENDS_task-opie-decorations = "\
+    opie-deco-flat \
+    opie-deco-liquid \
+    opie-deco-polished"
 
-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-games = "${task-qpe-games}"
-DEPENDS += " ${task-qpe-games}"
+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"
 
-task-qpe-inputmethods = "\
-custominput \
-flexis-zaurus \
-irk \
-irk-belkin \
-"
-RDEPENDS_task-qpe-inputmethods = "${task-qpe-inputmethods}"
-DEPENDS += " ${task-qpe-inputmethods}"
+RDEPENDS_task-qpe-inputmethods = "\
+    custominput \
+    flexis-zaurus \
+    irk \
+    irk-belkin"
 
-task-qpe-multimedia = "\
-mplayer \
-sidplayer \
-xmms-embedded "
-RDEPENDS_task-qpe-multimedia = "${task-qpe-multimedia}"
-DEPENDS += " ${task-qpe-multimedia}"
+RDEPENDS_task-qpe-multimedia = "\
+    mplayer \
+    sidplayer \
+    xmms-embedded"
+
+RDEPENDS_task-kdepim = "\
+    kopi \
+    kapi \
+    kopi-applet"
 
-task-kdepim = "\
-kopi \
-kapi \
-kopi-applet \
-"
-RDEPENDS_task-kdepim = "${task-kdepim}"
 DEPENDS += " kdepimpi"
 
-task-qpe-emulators = "\
-scummvm \
-snes9x-sdl-qpe \
-"
-RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
-DEPENDS += " ${task-qpe-emulators}"
+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 \
-"
+    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}"
 
-task-qpe-settings = "\
-qclockchange \
-"
-RDEPENDS_task-qpe-settings += "${task-qpe-settings}"
-DEPENDS += " ${task-qpe-settings}"
+RDEPENDS_task-qpe-settings += "\
+    qclockchange"
+