meta-opie & opie-image restructure (bug#307)

- new metapackage: meta-opie-all which contain non-OPIE stuff for QPE enviroment
- meta-opie contain only OPIE stuff (plus konqueror-embedded and qpdf2 for bigflash devices)
- moved opie-collections.inc functionality into meta-opie
- created many task-packages for all opie packages
- building opie-image from defined tasks
There is one problem with it - building opie-image for bigflash device fail on
opie-mediaplayer2 (skin problem) - don't know does it come from meta-opie or
does it is ipkg problem.

4 files changed, 442 insertions, 571 deletions

diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
new file mode 100644
index 0000000000..9abd270212
--- /dev/null
+++ b/packages/meta/meta-opie-all.bb
@@ -0,0 +1,173 @@
+DESCRIPTION = "Meta-package for Opie and QPE"
+SECTION = "opie/base"
+ALLOW_EMPTY = 1
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+DEPENDS = "meta-opie"
+PR = "r1"
+
+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}"
+
+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}"
+
+task-opie-decorations = "\
+opie-deco-flat \
+opie-deco-liquid \
+opie-deco-polished "
+RDEPENDS_task-opie-decorations = "${task-opie-decorations}"
+DEPENDS += " ${task-opie-decorations}"
+
+task-qpe-games = "\
+aliens \
+aliens-qt \
+atomic \
+billiardz \
+brickout \
+checkers \
+crossword \
+fish \
+froot \
+gemdropx \
+glider \
+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}"
+
+task-qpe-inputmethods = "\
+custominput \
+flexis-zaurus \
+irk \
+irk-belkin \
+"
+RDEPENDS_task-qpe-inputmethods = "${task-qpe-inputmethods}"
+DEPENDS += " ${task-qpe-inputmethods}"
+
+task-qpe-multimedia = "\
+mplayer \
+sidplayer \
+xmms-embedded "
+RDEPENDS_task-qpe-multimedia = "${task-qpe-multimedia}"
+DEPENDS += " ${task-qpe-multimedia}"
+
+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}"
+
+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 \
+"
+DEPENDS += " ${task-qpe-fonts}"
+
+task-qpe-settings = "\
+qclockchange \
+"
+RDEPENDS_task-qpe-settings += "${task-qpe-settings}"
+DEPENDS += " ${task-qpe-settings}"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 065a109251..976c671bc4 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,412 +1,227 @@
-DESCRIPTION = "Meta-package for Opie and QPE"
+DESCRIPTION = "Meta-package for Opie"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r25"
+PR = "r26"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
-PACKAGES = "task-opie-applets task-opie-applications task-opie-base \
-	task-opie-decorations task-opie-games task-opie-inputmethods \
-	task-opie-multimedia task-opie-pim task-opie-settings \
-	task-opie-styles task-opie-todayplugins task-opie-bluetooth \
-	task-opie-wlan task-opie-datebookplugins \
-	task-qpe-applets task-qpe-games task-qpe-inputmethods \
-	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
-	task-qpe-fonts task-qpe-settings"
-
-DEPENDS = "\
-libopieobex0 \
-opie-examples-python \
-opie-freetype \
-opie-help-en \
-opie-i18n \
-opie-keytabs \
-opie-libqrsync \
-opie-login \
-opie-securityplugin-blueping \
-opie-securityplugin-dummy \
-opie-securityplugin-notice \
-opie-securityplugin-pin \
-opie-sh \
-opie-symlinker \
-"
-
-task-opie-applets = "\
-opie-aboutapplet \
-opie-autorotateapplet \
-opie-batteryapplet \
-opie-bluetoothapplet \
-opie-brightnessapplet \
-opie-cardmon \
-opie-clipboardapplet \
-opie-clockapplet \
-opie-homeapplet \
-opie-irdaapplet \
-opie-lockapplet \
-opie-logoutapplet \
-opie-mailapplet \
-opie-memoryapplet \
-opie-multikeyapplet \
-opie-networkapplet \
-opie-notesapplet \
-opie-pcmciaapplet \
-opie-pyquicklaunchapplet \
-opie-restartapplet \
-opie-restartapplet2 \
-opie-rotateapplet \
-opie-screenshotapplet \
-opie-suspendapplet \
-opie-vmemo \
-opie-volumeapplet \
-opie-vtapplet \
-opie-zkbapplet \
-"
-RDEPENDS_task-opie-applets = "${task-opie-applets}"
-DEPENDS += " ${task-opie-applets}"
-
-task-qpe-applets = "\
-subapplet \
-tasklistapplet \
-"
-RDEPENDS_task-qpe-applets = "${task-qpe-applets}"
-DEPENDS += " ${task-qpe-applets}"
-
-task-opie-applications = "\
-opie-advancedfm \
-opie-bartender \
-opie-calculator \
-opie-camera \
-opie-checkbook \
-opie-clock \
-opie-console \
-opie-dagger \
-opie-embeddedkonsole \
-opie-euroconv \
-opie-eye \
-opie-ftp \
-opie-gutenbrowser \
-opie-helpbrowser \
-opie-irc \
-opie-keypebble \
-opie-odict \
-opie-oxygen \
-opie-rdesktop \
-opie-reader \
-opie-remote \
-opie-sheet \
-opie-tableviewer \
-opie-tinykate \
-opie-wellenreiter \
-manufacturers \
-opie-write \
-opie-zsafe "
-RDEPENDS_task-opie-applications = "${task-opie-applications}"
-DEPENDS += " ${task-opie-applications}"
-
-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}"
-
-task-opie-base = "\
-opie-alarm \
-opie-pics \
-opie-qcop \
-opie-quicklauncher \
-opie-sounds \
-opie-taskbar "
-RDEPENDS_task-opie-base = "${task-opie-base}"
-DEPENDS += " ${task-opie-base}"
-
-task-opie-decorations = "\
-opie-deco-flat \
-opie-deco-liquid \
-opie-deco-polished "
-RDEPENDS_task-opie-decorations = "${task-opie-decorations}"
-DEPENDS += " ${task-opie-decorations}"
-
-task-opie-games = "\
-opie-backgammon \
-opie-bounce \
-opie-buzzword \
-opie-fifteen \
-opie-go \
-opie-kbill \
-opie-kcheckers \
-opie-kpacman \
-opie-mindbreaker \
-opie-minesweep \
-opie-oyatzee \
-opie-parashoot \
-opie-qasteroids \
-opie-sfcave \
-opie-snake \
-opie-solitaire \
-opie-tetrix \
-opie-tictac \
-opie-wordgame \
-opie-zlines \
-opie-zsame \
-"
-RDEPENDS_task-opie-games = "${task-opie-games}"
-DEPENDS += " ${task-opie-games}"
-
-task-qpe-games = "\
-aliens \
-aliens-qt \
-atomic \
-billiardz \
-brickout \
-checkers \
-crossword \
-fish \
-freedroid \
-froot \
-gemdropx \
-glider \
-hexatrolic \
-iaimaster \
-icebloxx \
-knights \
-labyrinth \
-mahjongg \
-maki \
-nmm \
-pairs \
-pdamaze \
-pipeman \
-powermanga \
-prboom \
-puzz-le \
-qfish2 \
-qpe-vexed \
-qmatrix \
-rott \
-scummvm \
-shisensho \
-sokoban \
-tickypip \
-tickypip-levels \
-tron \
-vectoroids \
-win4 \
-xmame \
-zauralign \
-zddice \
-ziq \
-zmerlin \
-zrally \
-zrev7 \
-zsubhunt \
-ztappy "
-RDEPENDS_task-qpe-games = "${task-qpe-games}"
-DEPENDS += " ${task-qpe-games}"
-
-task-opie-inputmethods = "\
-opie-dasher \
-opie-dvorak \
-opie-handwriting \
-opie-jumpx \
-opie-keyboard \
-opie-keyview \
-opie-kjumpx \
-opie-multikey \
-opie-pickboard \
-opie-unikeyboard "
-RDEPENDS_task-opie-inputmethods = "${task-opie-inputmethods}"
-DEPENDS += " ${task-opie-inputmethods}"
-
-task-qpe-inputmethods = "\
-custominput \
-flexis-zaurus \
-"
-RDEPENDS_task-qpe-inputmethods = "${task-qpe-inputmethods}"
-DEPENDS += " ${task-qpe-inputmethods}"
-
-task-opie-multimedia = "\
-opie-mediaplayer1 \
-opie-mediaplayer1-libmadplugin \
-opie-mediaplayer1-libmodplugin \
-opie-mediaplayer1-libtremorplugin \
-opie-mediaplayer1-libwavplugin \
-opie-mediaplayer1-ogg-mp3 \
-opie-mediaplayer2 \
-opie-mediaplayer2-skin-default \
-opie-mediaplayer2-skin-default-landscape \
-opie-mediaplayer2-skin-pod \
-opie-mediaplayer2-skin-techno \
-opie-powerchord \
-opie-recorder \
-opie-tonleiter \
-"
-RDEPENDS_task-opie-multimedia = "${task-opie-multimedia}"
-DEPENDS += " ${task-opie-multimedia}"
-
-task-qpe-multimedia = "\
-mplayer \
-sidplayer \
-xmms-embedded "
-RDEPENDS_task-qpe-multimedia = "${task-qpe-multimedia}"
-DEPENDS += " ${task-qpe-multimedia}"
-
-task-opie-pim = "\
-opie-addressbook \
-opie-datebook \
-opie-drawpad \
-opie-mail \
-opie-pimconverter \
-opie-search \
-opie-textedit \
-opie-today \
-opie-todo "
-RDEPENDS_task-opie-pim = "${task-opie-pim} task-opie-todayplugins task-opie-datebookplugins"
-DEPENDS += " ${task-opie-pim}"
-
-task-kdepim = "\
-kopi \
-kapi \
-kopi-applet \
-"
-RDEPENDS_task-kdepim = "${task-kdepim}"
-DEPENDS += " kdepimpi"
-
-task-opie-settings = "\
-opie-appearance \
-opie-aqpkg \
-opie-backup \
-opie-button-settings \
-opie-calibrate \
-opie-citytime \
-opie-confeditor \
-opie-doctab \
-opie-formatter \
-opie-language \
-opie-launcher-settings \
-opie-light-and-power \
-opie-mediummount \
-opie-networksettings \
-opie-packagemanager \
-opie-security \
-opie-sshkeys \
-opie-sysinfo \
-opie-systemtime \
-opie-usermanager \
-opie-icon-reload \
-opie-vmemo-settings "
-RDEPENDS_task-opie-settings = "${task-opie-settings}"
-DEPENDS += " ${task-opie-settings}"
-
-task-opie-styles = "\
-opie-style-flat \
-opie-style-fresh \
-opie-style-liquid \
-opie-style-metal \
-opie-style-web \
-opie-style-phase \
-opie-theme "
-RDEPENDS_task-opie-styles = "${task-opie-styles}"
-DEPENDS += " ${task-opie-styles}"
-
-task-opie-todayplugins = "\
-opie-today-addressbookplugin \
-opie-today-datebookplugin \
-opie-today-fortuneplugin \
-opie-today-mailplugin \
-opie-today-stocktickerplugin \
-opie-today-todolistplugin \
-opie-today-weatherplugin "
-RDEPENDS_task-opie-todayplugins = "${task-opie-todayplugins}"
-DEPENDS += " ${task-opie-todayplugins}"
-
-task-opie-datebookplugins= "\
-opie-datebook-birthdayplugin \
-opie-datebook-chrisholidayplugin \
-opie-datebook-nationalholidayplugin "
-RDEPENDS_task-opie-datebookplugins = "${task-opie-datebookplugins}"
-DEPENDS += " ${task-opie-datebookplugins}"
-
-task-opie-bluetooth = "\
-opie-bluepin \
-opie-bluetoothmanager \
-opie-bluetoothapplet"
-RDEPENDS_task-opie-bluetooth = "${task-opie-bluetooth}"
-DEPENDS += " ${task-opie-bluetooth}"
-
-task-opie-wlan = "\
-opie-wellenreiter "
-RDEPENDS_task-opie-wlan = "${task-opie-wlan}"
-DEPENDS += " ${task-opie-wlan}"
-
-task-qpe-emulators = "\
-frodo \
-snes9x-sdl-qpe \
-e-uae \
-"
-RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
-DEPENDS += " ${task-qpe-emulators}"
-
-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 \
-"
-DEPENDS += " ${task-qpe-fonts}"
-
-task-qpe-settings = "\
-qclockchange \
-"
-RDEPENDS_task-qpe-settings += "${task-qpe-settings}"
-DEPENDS += " ${task-qpe-settings}"
+PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
+            task-opie-base-applets task-opie-base-apps \
+            task-opie-base-decorations task-opie-base-inputmethods \
+            task-opie-base-pim task-opie-base-settings \
+            task-opie-base-styles task-opie-bluetooth \
+            task-opie-datebookplugins task-opie-decorations \
+            task-opie-extra-apps task-opie-extra-settings \
+            task-opie-extra-styles task-opie-extra-games \
+            task-opie-games task-opie-inputmethods task-opie-irda \
+            task-opie-multimedia task-opie-pim task-opie-settings \
+            task-opie-styles task-opie-todayplugins task-opie-wlan"
+
+#
+# This is created by hand - we need konqueror-embedded and qpdf2
+# for devices with >16M of flash
+#
+
+DEPENDS = "irda-utils ntp wireless-tools timezones ttf-dejavu \
+           opie-ttf-support libopieobex0 opie-examples-python \
+           opie-freetype opie-help-en opie-i18n opie-login \
+           opie-securityplugin-blueping opie-securityplugin-dummy \
+           opie-securityplugin-notice opie-securityplugin-pin \
+           opie-sh opie-symlinker \
+           konqueror-embedded qpdf2"
+
+#
+# Dependencies to get the launcher up and running
+#
+
+task-opie-base = "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
+                  opie-sounds opie-ttf-support ttf-dejavu-sans ttf-dejavu-sans-mono"
+
+#
+# things for reasonable bootstrap image
+#
+
+task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
+                          opie-homeapplet opie-rotateapplet \
+                          opie-irdaapplet opie-brightnessapplet opie-batteryapplet \
+                          opie-pcmciaapplet opie-volumeapplet \
+                          opie-screenshotapplet"
+
+#
+# keyboard models can benefit from the vt and logout applets
+#
+task-opie-base-applets_append_openzaurus = " opie-vtapplet opie-logoutapplet"
+task-opie-base-applets_append_mnci       = " opie-vtapplet opie-logoutapplet"
+
+#
+# clamshell models can benefit from the autorotate applet
+#
+task-opie-base-depends_append_c7x0   = " opie-autorotateapplet"
+task-opie-base-depends_append_spitz  = " opie-autorotateapplet"
+task-opie-base-depends_append_akita  = " opie-autorotateapplet"
+task-opie-base-depends_append_borzoi = " opie-autorotateapplet"
+
+task-opie-base-inputmethods = "opie-multikey opie-handwriting opie-pickboard \
+                               opie-handwriting-classicset"
+
+task-opie-base-apps = "opie-console opie-clock opie-citytime opie-backup opie-sysinfo \
+                       opie-advancedfm"
+
+task-opie-base-settings = "opie-packagemanager opie-light-and-power opie-appearance \
+                           opie-systemtime opie-networksettings opie-button-settings \
+                           opie-icon-reload opie-launcher-settings opie-security"
+
+#
+# That settings can be removed and device will be still usable
+#
+
+task-opie-extra-settings = "opie-language opie-doctab opie-mediummount \
+                            opie-networksettings-wlanplugin opie-networksettings-pppplugin"
+
+task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
+
+task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
+
+#
+# Those styles are big and does not look good on QVGA screen
+#
+
+task-opie-extra-styles = "opie-style-liquid opie-style-metal"
+
+task-opie-base-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
+                               opie-today-todolistplugin"
+
+task-opie-base-pim = "opie-addressbook opie-datebook opie-drawpad \
+                      opie-search opie-textedit opie-today opie-todo \
+                      ${task-opie-base-todayplugins} \
+                      opie-datebook-birthdayplugin"
+
+#
+# all OPIE stuff
+#
+
+task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
+                     opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
+                     opie-clipboardapplet opie-clockapplet opie-homeapplet \
+                     opie-irdaapplet opie-lockapplet opie-logoutapplet \
+                     opie-mailapplet opie-memoryapplet opie-multikeyapplet \
+                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \
+                     opie-pyquicklaunchapplet opie-restartapplet \
+                     opie-restartapplet2 opie-rotateapplet \
+                     opie-screenshotapplet opie-suspendapplet opie-vmemo \
+                     opie-volumeapplet opie-vtapplet opie-zkbapplet \
+                     "
+task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
+                  opie-camera opie-checkbook opie-clock \
+                  opie-console opie-dagger opie-embeddedkonsole \
+                  opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
+                  opie-helpbrowser opie-irc opie-keypebble opie-odict \
+                  opie-oxygen opie-rdesktop opie-reader opie-remote \
+                  opie-sheet opie-tableviewer opie-tinykate \
+                  opie-wellenreiter opie-write opie-zsafe"
+
+task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
+
+task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \
+                   opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \
+                   opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \
+                   opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \
+                   opie-wordgame opie-zlines opie-zsame"
+
+task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting opie-jumpx \
+                          opie-keyboard opie-keyview opie-kjumpx opie-multikey \
+                          opie-pickboard opie-unikeyboard"
+
+task-opie-multimedia = "opie-mediaplayer1 \
+                        opie-mediaplayer1-libmadplugin \
+                        opie-mediaplayer1-libmodplugin \
+                        opie-mediaplayer1-libtremorplugin \
+                        opie-mediaplayer1-libwavplugin \
+                        opie-mediaplayer1-ogg-mp3 \
+                        opie-mediaplayer2 \
+                        opie-mediaplayer2-skin-default \
+                        opie-mediaplayer2-skin-default-landscape \
+                        opie-mediaplayer2-skin-pod \
+                        opie-mediaplayer2-skin-techno \
+                        opie-powerchord opie-recorder opie-tonleiter"
+
+task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \
+                      opie-calibrate opie-citytime opie-confeditor opie-doctab \
+                      opie-formatter opie-language opie-launcher-settings \
+                      opie-light-and-power opie-mediummount opie-networksettings \
+                      opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
+                      opie-systemtime opie-usermanager opie-icon-reload \
+                      opie-vmemo-settings"
+
+task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \
+                    opie-style-web opie-style-phase opie-theme"
+
+task-opie-datebookplugins= "opie-datebook-birthdayplugin \
+                            opie-datebook-chrisholidayplugin \
+                            opie-datebook-nationalholidayplugin"
+
+task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
+                          opie-today-fortuneplugin opie-today-mailplugin \
+                          opie-today-stocktickerplugin opie-today-todolistplugin \
+                          opie-today-weatherplugin"
+
+task-opie-pim = "${task-opie-base-pim} opie-mail opie-pimconverter"
+
+task-opie-bluetooth = "bluez-utils-nodbus openobex obexftp obexpush \
+                       libopieobex0 opie-bluepin opie-bluetoothmanager \
+                       opie-bluetoothapplet"
+
+task-opie-wlan = "wireless-tools opie-wellenreiter"
+
+task-opie-irda = "irda-utils openobex libopieobex0 obexftp"
+
+#
+# additional things for a >= 24mb distribution
+#
+
+task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
+                        opie-rdesktop opie-wellenreiter opie-irc \
+                        opie-mediaplayer2 \
+                        konqueror-embedded qpdf2"
+
+task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
+                         opie-tetrix"
+
+#
+# Let's build DEPENDS and RDEPENDS now
+#
+
+DEPENDS += "${task-opie-applets} ${task-opie-apps} \
+	    opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
+	    opie-sounds opie-ttf-support ttf-dejavu \
+            ${task-opie-bluetooth} ${task-opie-datebookplugins} \
+            ${task-opie-decorations} ${task-opie-extra-settings} \
+            ${task-opie-games} ${task-opie-inputmethods} ${task-opie-irda} \
+            ${task-opie-multimedia} ${task-opie-todayplugins} ${task-opie-pim} \
+            ${task-opie-settings} ${task-opie-styles} ${task-opie-wlan}"
+
+RDEPENDS_task-opie-applets              = "${task-opie-applets}"
+RDEPENDS_task-opie-apps                 = "${task-opie-apps}"
+RDEPENDS_task-opie-base-applets         = "${task-opie-base-applets}"
+RDEPENDS_task-opie-base-apps            = "${task-opie-base-apps}"
+RDEPENDS_task-opie-base-decorations     = "${task-opie-base-decorations}"
+RDEPENDS_task-opie-base-inputmethods    = "${task-opie-base-inputmethods}"
+RDEPENDS_task-opie-base-pim             = "${task-opie-base-pim}"
+RDEPENDS_task-opie-base-settings        = "${task-opie-base-settings}"
+RDEPENDS_task-opie-base-styles          = "${task-opie-base-styles}"
+RDEPENDS_task-opie-base                 = "${task-opie-base}"
+RDEPENDS_task-opie-bluetooth            = "${task-opie-bluetooth}"
+RDEPENDS_task-opie-datebookplugins      = "${task-opie-datebookplugins}"
+RDEPENDS_task-opie-decorations          = "${task-opie-decorations}"
+RDEPENDS_task-opie-extra-apps           = "${task-opie-extra-apps}"
+RDEPENDS_task-opie-extra-games          = "${task-opie-extra-games}"
+RDEPENDS_task-opie-extra-settings       = "${task-opie-extra-settings}"
+RDEPENDS_task-opie-games                = "${task-opie-games}"
+RDEPENDS_task-opie-inputmethods         = "${task-opie-inputmethods}"
+RDEPENDS_task-opie-irda                 = "${task-opie-irda}"
+RDEPENDS_task-opie-multimedia           = "${task-opie-multimedia}"
+RDEPENDS_task-opie-pim                  = "${task-opie-pim}"
+RDEPENDS_task-opie-settings             = "${task-opie-settings}"
+RDEPENDS_task-opie-styles               = "${task-opie-styles}"
+RDEPENDS_task-opie-todayplugins         = "${task-opie-todayplugins}"
+RDEPENDS_task-opie-wlan                 = "${task-opie-wlan}"
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
deleted file mode 100644
index 3f52153224..0000000000
--- a/packages/meta/opie-collections.inc
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# A collection of dependencies for images including Opie or parts of it.
-#
-
-#
-# Dependencies to get the launcher up and running
-#
-
-OPIE_LIBS_DEPENDS  = "qte libopie2 opie-ttf-support ttf-dejavu"
-OPIE_LIBS_RDEPENDS = "opie-ttf-support ttf-dejavu-sans ttf-dejavu-sans-mono"
-OPIE_BASE = "opie-qcop opie-freetype opie-qss opie-quicklauncher opie-taskbar \
-             opie-pics opie-sounds"
-
-#
-# Things for reasonable bootstrap image
-#
-
-OPIE_BASE_APPLETS = "opie-aboutapplet opie-clockapplet      opie-suspendapplet	\
-                     opie-homeapplet  opie-multikeyapplet   opie-rotateapplet 	\
-                     opie-irdaapplet  opie-brightnessapplet opie-batteryapplet  \
-                     opie-pcmciaapplet "
-
-OPIE_BASE_INPUTMETHODS = "opie-multikey opie-handwriting opie-pickboard"
-
-OPIE_BASE_APPS = "opie-packagemanager opie-keytabs opie-console opie-clock \
-                  opie-citytime opie-backup"
-
-OPIE_BASE_SETTINGS = "opie-light-and-power opie-appearance opie-systemtime \
-                      opie-sysinfo opie-networksettings opie-button-settings \
-                      opie-icon-reload"
-
-OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
-
-OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \
-                    opie-style-metal opie-style-web opie-style-phase"
-
-OPIE_BLUETOOTH_DEPENDS = "bluez-utils-nodbus openobex obexftp openobex-apps obexpush \
-                          libopieobex0 libopietooth1 \
-                          opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
-OPIE_BLUETOOTH_RDEPENDS = "bluez-utils-nodbus obexftp openobex-apps obexpush \
-                           opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
-
-OPIE_BASE_DEPENDS = "ipkg timezones ntp irda-utils wireless-tools usbutils ${OPIE_BLUETOOTH_DEPENDS}"
-OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset wireless-tools ${OPIE_BLUETOOTH_RDEPENDS}"
-
-#
-# Clamshell models can benefit from the autorotate applet
-#
-OPIE_BASE_DEPENDS_append_c7x0   = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_spitz  = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_akita  = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_borzoi = " opie-autorotateapplet"
-
-# Keyboard models can benefit from the VT and logout applets
-OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet"
-OPIE_BASE_APPLETS_append_mnci       = " opie-vtapplet opie-logoutapplet"
-
-#
-# Additional things for a standard 16MB distribution
-#
-
-OPIE_PIM_BASE = "opie-alarm opie-drawpad opie-textedit"
-
-OPIE_PIM_MAIL = "opie-mail"
-
-OPIE_PIM = "${OPIE_PIM_BASE} opie-addressbook opie-datebook opie-todo opie-today \
-            opie-today-addressbookplugin opie-today-datebookplugin opie-today-todolistplugin \
-            opie-datebook-nationalholidayplugin opie-datebook-birthdayplugin "
-
-KDE_PIM_DEPENDS = "${OPIE_PIM_BASE} kdepimpi"
-KDE_PIM_RDEPENDS = "kopi kapi kopi-applet"
-
-OPIE_EXTRA_APPLETS = "opie-clipboardapplet opie-volumeapplet opie-screenshotapplet"
-
-OPIE_EXTRA_APPS = "opie-advancedfm"
-
-OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-security \
-            opie-mediummount opie-networksettings-wlanplugin opie-networksettings-pppplugin"
-
-#
-# Additional things for a >= 24MB distribution
-#
-
-OPIE_DEPENDS_24  = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
-                    qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc opie-mediaplayer2"
-OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
-                    qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc opie-mediaplayer2 libxine-plugin-decode-ff libxine-plugin-dmx-avi"
-
-#
-#
-#
-
-def opie_more_depends(d):
-	import bb
-	root_flash_size = int( bb.data.getVar( "ROOT_FLASH_SIZE", d, True ) or "16" )
-	if root_flash_size >= 24: return bb.data.getVar( "OPIE_DEPENDS_24", d, True )
-	else: return " "
-
-def opie_more_rdepends(d):  
-	import bb
-	root_flash_size = int( bb.data.getVar( "ROOT_FLASH_SIZE", d, True ) or "16" )
-	if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True )
-	else: return " "
-
-OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}"
-OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}"
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 5041c757b7..f8ae846233 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -6,71 +6,62 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${
 FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 
-include opie-collections.inc
-
-#
-# Putting it altogether. Better state IPKG_INSTALL and DEPENDS twice, because library names != package names.
-#
-
-export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS_RDEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
-                       ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_RDEPENDS} \
-                       ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} \
-                       ${OPIE_EXTRA_APPS} ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} \
-                       ${OPIE_BASE_INPUTMETHODS} ${OPIE_MORE_RDEPENDS}"
-
-DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
-            ${OPIE_BASE_SETTINGS}  ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${OPIE_PIM} \
-            ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
-            ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS} ${OPIE_MORE_DEPENDS}"
+DEPENDS = "meta-opie"
 
+extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
+export IPKG_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \
+                       task-opie-base-inputmethods task-opie-base-apps \
+                       task-opie-base-settings task-opie-base-decorations \
+                       task-opie-base-styles task-opie-base-pim \
+		       task-opie-extra-settings \
+		       ${extra_stuff}"
 
 # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
 merge_feeds() {
 
-	if ! test -z "${FEED_URIS}"
-	then
-		# Die gracefully if ipkg-collateral failed
-		if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf"
-		then
-			echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
-			exit 1
-		fi
-		
-		# comment out existing feed-sources inserted by ipkg-collateral
-		cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
-		rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
-		
-		# extract, then delete destinations
-		cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
-		cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
-		rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
-
-
-		for line in ${FEED_URIS}
-		do
-			# strip leading and trailing spaces/tabs, then split into name and uri
-			line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
-			feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
-			feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"		
-
-			# insert new feed-sources
-			echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
-		done
-		
-		# remove temporary files and rebuild ipkg.conf
-		echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
-		cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
-		rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
-		
-		# remove -feed.conf files which are no longer needed
-		cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf				
-	fi
+        if ! test -z "${FEED_URIS}"
+        then
+                # Die gracefully if ipkg-collateral failed
+                if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf"
+                then
+                        echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
+                        exit 1
+                fi
+                
+                # comment out existing feed-sources inserted by ipkg-collateral
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+                rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+                
+                # extract, then delete destinations
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+                rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+
+
+                for line in ${FEED_URIS}
+                do
+                        # strip leading and trailing spaces/tabs, then split into name and uri
+                        line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
+                        feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
+                        feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"                
+
+                        # insert new feed-sources
+                        echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+                done
+                
+                # remove temporary files and rebuild ipkg.conf
+                echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+                rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+                
+                # remove -feed.conf files which are no longer needed
+                cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf                               
+        fi
 }
 
-
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
 IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"