70 files changed, 0 insertions, 1140 deletions
diff --git a/meta/e-image.oe b/meta/bootstrap-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/e-image.oe
+++ b/meta/bootstrap-image.bb
diff --git a/meta/bootstrap-image.oe b/meta/bootstrap-image.oe
deleted file mode 100644
index 1157a7a44b..0000000000
--- a/meta/bootstrap-image.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-export IMAGE_BASENAME = "bootstrap-image"
-export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap"
-
-DEPENDS = "task-bootstrap"
-
-inherit image_ipk
-
-FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
-                                gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe \
-                               opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie \
-                                  e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
-
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/0.8/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/0.8/feed/gpe \
-                               opie##http://familiar.handhelds.org/releases/0.8/feed/opie \
-                                  e##http://familiar.handhelds.org/releases/0.8/feed/e"
-
diff --git a/meta/gpe-image-blank-user.oe b/meta/dvb-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/gpe-image-blank-user.oe
+++ b/meta/dvb-image.bb
diff --git a/meta/dvb-image.oe b/meta/dvb-image.oe
deleted file mode 100644
index fa401eae31..0000000000
--- a/meta/dvb-image.oe
+++ /dev/null
@@ -1,10 +0,0 @@
-export IMAGE_BASENAME = "dvb-image"
-
-IMAGE_LINGUAS = ""
-
-DVB_PACKAGES = "task-bootstrap task-dvb"
-
-export IPKG_INSTALL = "${DVB_PACKAGES}"
-DEPENDS = "${DVB_PACKAGES}"
-
-inherit image_ipk
diff --git a/meta/grant-image.oe b/meta/e-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/grant-image.oe
+++ b/meta/e-image.bb
diff --git a/meta/meta-gpe-extras.oe b/meta/gpe-feed.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/meta-gpe-extras.oe
+++ b/meta/gpe-feed.bb
diff --git a/meta/gpe-feed.oe b/meta/gpe-feed.oe
deleted file mode 100644
index cd132b0f9c..0000000000
--- a/meta/gpe-feed.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# A dependency isn't really needed. Just build meta-opie or even world
-# and build the feed afterwards.
-
-#DEPENDS = "meta-gpe"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export FEED_PATTERN = "^gpe|^x11"
-export FEED_NAME = "gpe"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export EXCLUDE_FROM_FEED = "-dev$"
-
-inherit split_ipk_feeds
diff --git a/meta/meta-grant.oe b/meta/gpe-image-blank-user.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/meta-grant.oe
+++ b/meta/gpe-image-blank-user.bb
diff --git a/meta/meta-opie-dynamic.oe b/meta/gpe-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/meta-opie-dynamic.oe
+++ b/meta/gpe-image.bb
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
deleted file mode 100644
index 156f0c8626..0000000000
--- a/meta/gpe-image.oe
+++ /dev/null
@@ -1,46 +0,0 @@
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
-
-FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
-                                gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe"
-FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
-                                gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/0.8/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/0.8/feed/gpe"
-
-PR = "r8"
-
-export IMAGE_BASENAME = "gpe-image"
-
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
-GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial"
-
-#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
-#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "minimo"
-GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
-
-GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
-
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
-
-XSERVER ?= "xserver-kdrive-fbdev"
-
-DEPENDS = "task-bootstrap \
-	   meta-gpe \
-	   ${GPE_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
-           	       gpe-task-pim gpe-task-settings \
-	               gpe-task-apps ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_EXTRA_INSTALL}"
-
-ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
-
-inherit image_ipk
diff --git a/meta/meta-sdl.oe b/meta/grant-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/meta-sdl.oe
+++ b/meta/grant-image.bb
diff --git a/meta/nslu2-linksys-image.oe b/meta/meta-e-x11.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/nslu2-linksys-image.oe
+++ b/meta/meta-e-x11.bb
diff --git a/meta/meta-e-x11.oe b/meta/meta-e-x11.oe
deleted file mode 100644
index 00bd4cd074..0000000000
--- a/meta/meta-e-x11.oe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Meta-package for Enlightenment X11 Without FrameBuffer"
-MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
-PACKAGES = "e e-libs e-base"
-
-FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
-              e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
-
-ALLOW_EMPTY = 1
-
-# task-e-libs = "libiconv imlib2 edb eet evas ecore epeg epsilon embryo edje esmart emotion etox ewl"
-# epsilon is currently broke for cross compiling without a patch, raster is looking at it
-
-task-e-libs = "libiconv imlib2 edb eet evas ecore epeg embryo edje esmart emotion etox ewl"
-
-task-e-base = ""
-
-RDEPENDS_e-libs = "${task-e-libs}"
-DEPENDS += "${task-e-libs}"
-
-RDEPENDS_e-base = "${task-e-base}"
-DEPENDS += "${task-e-base}"
diff --git a/meta/nylon-image-extra.oe b/meta/meta-e.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/nylon-image-extra.oe
+++ b/meta/meta-e.bb
diff --git a/meta/meta-e.oe b/meta/meta-e.oe
deleted file mode 100644
index 7c8359e3ed..0000000000
--- a/meta/meta-e.oe
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Meta-package for the Enlightenment Palmtop Environment (Codename: EpiCenter)"
-PACKAGES = "e e-libs e-base"
-
-FEED_URIS += "e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
-
-ALLOW_EMPTY = 1
-
-task-e-libs = "evas edb ecore eet embryo edje etox ewl"
-task-e-base = ""
-
-RDEPENDS_e-libs = "${task-e-libs}"
-DEPENDS += "${task-e-libs}"
-
-RDEPENDS_e-base = "${task-e-base}"
-DEPENDS += "${task-e-base}"
diff --git a/meta/opie-locale-feed.oe b/meta/meta-gpe-extras.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/opie-locale-feed.oe
+++ b/meta/meta-gpe-extras.bb
diff --git a/meta/sdl-image.oe b/meta/meta-gpe.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/sdl-image.oe
+++ b/meta/meta-gpe.bb
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
deleted file mode 100644
index 60d5ef90fb..0000000000
--- a/meta/meta-gpe.oe
+++ /dev/null
@@ -1,103 +0,0 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
-DESCRIPTION = "Meta-package for GPE Palmtop Environment"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r24"
-
-ALLOW_EMPTY = 1
-
-gpe-base-depends = "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
-DEPENDS += " ${gpe-base-depends}"
-
-gpe-task-base = "\
-    bluez-utils-dbus \
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    xst \
-    xprop \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    gpe-bootsplash \
-    libgtkstylus \
-    gpe-appmgr \
-    detect-stylus"
-
-RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \
-			   gdk-pixbuf-loader-xpm \
-			   gdk-pixbuf-loader-jpeg \
-			   pango-module-basic-x \
-			   pango-module-basic-fc \
-			   ${gpe-task-base}"
-DEPENDS += " ${gpe-task-base}"
-
-gpe-task-pim = "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-sketchbook \
-    gpe-contacts \
-    gpe-today \
-    figment"
-RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
-DEPENDS += " ${gpe-task-pim}"
-
-gpe-task-settings = "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-beam \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    xmonobut"
-
-RDEPENDS_gpe-task-settings := "${gpe-task-settings}"
-DEPENDS += " ${gpe-task-settings}"
-
-gpe-task-apps = "\
-    gpe-edit \
-    gpe-gallery \
-    gpe-calculator \
-    gpe-clock \
-    gpe-plucker \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    mbmerlin \
-    miniclipboard \
-    rosetta"
-
-RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
-DEPENDS += " ${gpe-task-apps}"
-
-gpe-task-games = "\
-    gpe-tetris \
-    gpe-othello \
-    gweled"
-
-RDEPENDS_gpe-task-games := "${gpe-task-games}"
-DEPENDS += "${gpe-task-games}"
-
-DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
-
diff --git a/meta/switchbox-image.oe b/meta/meta-grant.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/switchbox-image.oe
+++ b/meta/meta-grant.bb
diff --git a/meta/task-xfce-base.oe b/meta/meta-opie-dynamic.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/task-xfce-base.oe
+++ b/meta/meta-opie-dynamic.bb
diff --git a/meta/twin-image.oe b/meta/meta-opie.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/twin-image.oe
+++ b/meta/meta-opie.bb
diff --git a/meta/meta-opie.oe b/meta/meta-opie.oe
deleted file mode 100644
index 4f1c3523a3..0000000000
--- a/meta/meta-opie.oe
+++ /dev/null
@@ -1,398 +0,0 @@
-DESCRIPTION = "Meta-package for Opie and QPE"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-SECTION = "opie/base"
-ALLOW_EMPTY = 1
-PR = "r16"
-PACKAGE_ARCH = "all"
-LICENSE = "MIT"
-
-PACKAGES = "opie 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-today task-opie-bluetooth \
-	task-opie-wlan \
-	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-pyquicklaunchapplet \
-opie-restartapplet \
-opie-restartapplet2 \
-opie-rotateapplet \
-opie-screenshotapplet \
-opie-suspendapplet \
-opie-vmemo \
-opie-volumeapplet \
-opie-vtapplet \
-opie-wirelessapplet \
-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-mobilemsg \
-opie-odict \
-opie-oxygen \
-opie-performance \
-opie-rdesktop \
-opie-reader \
-opie-remote \
-opie-sheet \
-opie-showimg \
-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 \
-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 \
-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-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"
-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-tabmanager \
-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-bluetooth = "\
-opie-bluepin \
-opie-bluetoothmanager \
-opie-bluetoothapplet"
-RDEPENDS_task-opie-bluetooth = "${task-opie-bluetooth}"
-DEPENDS += " ${task-opie-bluetooth}"
-
-task-opie-wlan = "\
-opie-wellenreiter \
-opie-wirelessapplet "
-RDEPENDS_task-opie-wlan = "${task-opie-wlan}"
-DEPENDS += " ${task-opie-wlan}"
-
-task-qpe-emulators = "\
-frodo \
-snes9x-sdl-qpe \
-uae \
-"
-RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
-DEPENDS += " ${task-qpe-emulators}"
-
-task-qpe-fonts = "\
-qpf-georgia \
-qpf-helvetica \
-qpf-unifont \
-qpf-utopia \
-qpf-verdana \
-terminus \
-qpf-bitstream-vera-sans-mono \
-qpf-bitstream-vera \
-"
-DEPENDS += " ${task-qpe-fonts}"
-
-task-qpe-settings = "\
-qclockchange \
-"
-RDEPENDS_task-qpe-settings += "${task-qpe-settings}"
-DEPENDS += " ${task-qpe-settings}"
diff --git a/meta/uml-image.oe b/meta/meta-sdk.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/uml-image.oe
+++ b/meta/meta-sdk.bb
diff --git a/meta/meta-sdk.oe b/meta/meta-sdk.oe
deleted file mode 100644
index edbe19697b..0000000000
--- a/meta/meta-sdk.oe
+++ /dev/null
@@ -1,36 +0,0 @@
-DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross"
-
-inherit sdk
-
-SDK_DIR = "${TMPDIR}/sdk"
-SDK_OUTPUT = "${SDK_DIR}/image"
-
-IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}"
-IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
-
-HOST_INSTALL = "binutils-cross-sdk gcc-cross-sdk gdb-cross"
-TARGET_INSTALL = "libc6 glibc-dev"
-
-do_populate_sdk() {
-	touch ${DEPLOY_DIR_IPK}/Packages
-	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
-
-	rm -rf ${SDK_OUTPUT}
-	mkdir -p ${SDK_OUTPUT}
-
-	cat <<EOF >${SDK_DIR}/ipkg-host.conf
-src oe file:${DEPLOY_DIR_IPK}
-arch ${BUILD_ARCH} 1
-EOF
-	cat <<EOF >${SDK_DIR}/ipkg-target.conf
-src oe file:${DEPLOY_DIR_IPK}
-arch ${TARGET_ARCH} 1
-EOF
-	${IPKG_HOST} update
-	${IPKG_HOST} --nodeps install ${HOST_INSTALL}
-	${IPKG_TARGET} update
-	${IPKG_TARGET} install ${TARGET_INSTALL}
-}
-
-do_populate_sdk[nostamp] = 1
-addtask populate_sdk before do_build after do_install
diff --git a/meta/unslung-able-image.oe b/meta/meta-sdl.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/unslung-able-image.oe
+++ b/meta/meta-sdl.bb
diff --git a/meta/xbase-clients.oe b/meta/mythfront-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/xbase-clients.oe
+++ b/meta/mythfront-image.bb
diff --git a/meta/mythfront-image.oe b/meta/mythfront-image.oe
deleted file mode 100644
index f4fd2019a4..0000000000
--- a/meta/mythfront-image.oe
+++ /dev/null
@@ -1,12 +0,0 @@
-export IMAGE_BASENAME = "mythfront-image"
-
-IMAGE_ROOTFS_SIZE_ext2 = "85000"
-IMAGE_ROOTFS_SIZE_ext2.gz = "85000"
-IMAGE_LINGUAS = ""
-
-MYTHFRONT_PACKAGES = "task-bootstrap task-mythfront"
-
-export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}"
-DEPENDS = "${MYTHFRONT_PACKAGES}"
-
-inherit image_ipk
diff --git a/meta/xterminal-image.oe b/meta/nslu2-linksys-image.bb
index e69de29bb2..e69de29bb2 100644
--- a/meta/xterminal-image.oe
+++ b/meta/nslu2-linksys-image.bb
diff --git a/meta/nylon-feed.bb b/meta/nylon-feed.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nylon-feed.bb
diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe
deleted file mode 100644
index 5e61cc0827..0000000000
--- a/meta/nylon-feed.oe
+++ /dev/null
@@ -1,91 +0,0 @@
-DEPENDS = " \
-base-files \
-bash \
-bridge-utils \
-busybox \
-chillispot \
-db3 \
-ddclient \
-dhcp-forwarder \
-dhcp \
-dnsmasq \
-expat \
-gdb \
-glib-2.0 \
-glibc \
-gmp \
-gnupg \
-hostap-modules \
-hostap-utils \
-hostap-daemon \
-hotplug \
-htb-init \
-ifplugd \
-initscripts \
-iperf \
-ipkg \
-iproute2 \
-iptables \
-virtual/kernel \
-kismet \
-less \
-libmail-sendmail-perl \
-libnetserver-generic-perl \
-libpcap \
-lsof \
-lzo \
-madwifi-modules \
-maradns \
-mc \
-mobilemesh \
-modutils \
-mtd \
-mtr \
-nano \
-ncurses \
-netbase \
-netperf \
-net-snmp \
-ntp \
-nylon-scripts \
-nylon-statistics \
-openssh \
-openssl \
-openvpn \
-openswan \
-perl \
-ppp \
-ppp-dsl \
-rp-pppoe \
-rrdtool \
-prism2-firmware-update \
-prism54-module \
-prism54-firmware \
-shorewall \
-stunnel \
-sysvinit \
-tcpdump \
-tinc \
-timezones \
-unik-olsrd \
-vtun \
-wireless-tools \
-wlan-ng-modules \
-zlib \
-"
-
-# TODO:
-# ksymoops / binutils
-# strace: SYS_read?
-# gdb-cross: install paths, sdk?
-# screen: sgttyb?
-# nocat?
-# pptp
-# meshroaming
-
-do_index() {
-	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}    
-}
-
-addtask index before do_build after do_install
-
diff --git a/meta/nylon-image-base.bb b/meta/nylon-image-base.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nylon-image-base.bb
diff --git a/meta/nylon-image-base.oe b/meta/nylon-image-base.oe
deleted file mode 100644
index fa09de961a..0000000000
--- a/meta/nylon-image-base.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-export IMAGE_BASENAME = "nylon-base"
- 
-NYLON_BASE = "base-files base-passwd bash busybox \
-	ipkg initscripts less \
-	modutils modutils-initscripts mtd \
-	nano ncurses netbase \
-	openssh sysvinit \
-	timezones tinylogin"
-
-DEPENDS = "virtual/kernel \ 
-	${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}"
-	
-RDEPENDS = "kernel modutils-depmod modutils-modinfo \
-	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
-
-export IPKG_INSTALL = "${RDEPENDS}" 
-
-IMAGE_LINGUAS = ""
-
-# we dont need the kernel in the image
-ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
-
-inherit image_ipk
diff --git a/meta/nylon-image-extra.bb b/meta/nylon-image-extra.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nylon-image-extra.bb
diff --git a/meta/nylon-image-standard.bb b/meta/nylon-image-standard.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nylon-image-standard.bb
diff --git a/meta/nylon-image-standard.oe b/meta/nylon-image-standard.oe
deleted file mode 100644
index 30dfc08848..0000000000
--- a/meta/nylon-image-standard.oe
+++ /dev/null
@@ -1,22 +0,0 @@
-include nylon-image-base.oe
-
-export IMAGE_BASENAME = "nylon-standard"
- 
-NYLON_STANDARD = "\
-	bridge-utils \
-	dnsmasq \
-	hostap-utils \
-	ifplugd iproute2 iptables \
-	mobilemesh \
-	nylon-scripts \
-	ppp rp-pppoe \
-	shorewall \
-	tcpdump \
-	wireless-tools \
-	unik-olsrd"
-
-DEPENDS += "hostap-modules ntp \ 
-	${NYLON_STANDARD}"
-	
-RDEPENDS += "hostap-modules-pci ntpdate \
-	${NYLON_STANDARD}"
diff --git a/meta/openslug-image.bb b/meta/openslug-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/openslug-image.bb
diff --git a/meta/openslug-image.oe b/meta/openslug-image.oe
deleted file mode 100644
index a11eca136a..0000000000
--- a/meta/openslug-image.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-PR = "r1"
-
-IMAGE_BASENAME = "openslug"
-
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native patcher-native virtual/armeb-linux-uclibc-gcc \
-	virtual/libc makedevs-native mtd-native slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware "
-
-DEPENDS = "base-files base-passwd-3.5.7 \
-        busybox dropbear hotplug initscripts modutils netbase \
-        sysvinit tinylogin lrzsz portmap \
-        modutils-initscripts ixp4xx-csr ixp425-eth \
-        ipkg-collateral ipkg ipkg-link \
-        ${OPENSLUG_EXTRA_DEPENDS}"
-
-IPKG_INSTALL = "base-files base-passwd \
-        busybox dropbear hotplug initscripts netbase \
-	modutils-depmod modutils-modinfo modutils-initscripts \
-        update-modules sysvinit tinylogin lrzsz portmap \
-        ixp4xx-csr ixp425-eth \
-        ipkg-collateral ipkg ipkg-link \
-        ${OPENSLUG_EXTRA_INSTALL}"
-
-inherit image_ipk
diff --git a/meta/opie-feed.bb b/meta/opie-feed.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/opie-feed.bb
diff --git a/meta/opie-feed.oe b/meta/opie-feed.oe
deleted file mode 100644
index 981ef074d3..0000000000
--- a/meta/opie-feed.oe
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# A dependency isn't really needed. Just build meta-opie or even world
-# and build the feed afterwards.
-
-#DEPENDS = "meta-opie"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export FEED_PATTERN = "^opie"
-export FEED_NAME = "opie"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export EXCLUDE_FROM_FEED = "-dev$|translations "
-inherit split_ipk_feeds
-
-
diff --git a/meta/opie-image.bb b/meta/opie-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/opie-image.bb
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
deleted file mode 100644
index 757b16b52c..0000000000
--- a/meta/opie-image.oe
+++ /dev/null
@@ -1,73 +0,0 @@
-export IMAGE_BASENAME = "opie-image"
-export IMAGE_LINGUAS = ""
-
-FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
-FEED_URIS_append-opensimpad = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/0.8/feed/opie"
-
-PR = "r8"
-
-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}"
- 
-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}"
-
-# 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
-
-		# 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 $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
-}
-
-
-# zap the root password
-#IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
-
-# merge feed-sources into ipkg.conf
-IMAGE_PREPROCESS_COMMAND = "merge_feeds"
-
-inherit image_ipk
-
-
diff --git a/meta/opie-kdepim-image.bb b/meta/opie-kdepim-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/opie-kdepim-image.bb
diff --git a/meta/opie-kdepim-image.oe b/meta/opie-kdepim-image.oe
deleted file mode 100644
index c5d97e8684..0000000000
--- a/meta/opie-kdepim-image.oe
+++ /dev/null
@@ -1,24 +0,0 @@
-export IMAGE_BASENAME = "opie-kdepim-image"
-export IMAGE_LINGUAS = ""
-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} \
-                       ${KDE_PIM_RDEPENDS} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} \
-                       ${OPIE_EXTRA_APPS} ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} \
-                       ${OPIE_BASE_INPUTMETHODS}"
-
-DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
-            ${OPIE_BASE_SETTINGS}  ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${KDE_PIM_DEPENDS} \
-            ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
-            ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}"
-
-
-# zap the root password
-#IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
-
-inherit image_ipk
diff --git a/meta/opie-locale-feed.bb b/meta/opie-locale-feed.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/opie-locale-feed.bb
diff --git a/meta/oz-feed.bb b/meta/oz-feed.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/oz-feed.bb
diff --git a/meta/oz-feed.oe b/meta/oz-feed.oe
deleted file mode 100644
index e526a36765..0000000000
--- a/meta/oz-feed.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# A dependency isn't really needed. Just build meta-opie or even world
-# and build the feed afterwards.
-
-#DEPENDS = "meta-opie"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export FEED_PATTERN = "^console|^libs|^base"
-export FEED_NAME = "openzaurus"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export EXCLUDE_FROM_FEED = " locale-| glibc-|-dev$"
-
-inherit split_ipk_feeds
diff --git a/meta/oz-system-feed.bb b/meta/oz-system-feed.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/oz-system-feed.bb
diff --git a/meta/oz-system-feed.oe b/meta/oz-system-feed.oe
deleted file mode 100644
index b393f29f1d..0000000000
--- a/meta/oz-system-feed.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# A dependency isn't really needed. Just build meta-? or even world
-# and build the feed afterwards.
-
-#DEPENDS = "meta-opie"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export FEED_PATTERN = "\ locale-|glibc-|-dev$|devel"
-export FEED_NAME = "openzaurus-system"
-
-# egrep -i Pattern matched against "$Section $Package-Name"
-export EXCLUDE_FROM_FEED = ""
-
-inherit split_ipk_feeds
-
-
diff --git a/meta/sdl-image.bb b/meta/sdl-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/sdl-image.bb
diff --git a/meta/switchbox-image.bb b/meta/switchbox-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/switchbox-image.bb
diff --git a/meta/task-bootstrap.bb b/meta/task-bootstrap.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/task-bootstrap.bb
diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
deleted file mode 100644
index cd84ad5904..0000000000
--- a/meta/task-bootstrap.oe
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "Core packages required for a basic installation"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r13"
-
-# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
-# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
-PACKAGE_ARCH := "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
-
-MODUTILS ?= "24 26"
-
-def bootstrap_modutils_depends(d):
-	import oe
-	m = oe.data.getVar('MODUTILS', d, 1)
-	r = []
-	if '24' in m:
-		r.append('modutils')
-	if '26' in m:
-		r.append('module-init-tools')
-	return ' '.join(r)
-
-def bootstrap_modutils_rdepends(d):
-	import oe
-        m = oe.data.getVar('MODUTILS', d, 1)
-        r = []
-	if '24' in m:
-                r.append('modutils-depmod')
-        if '26' in m:
-                r.append('module-init-tools-depmod')
-        return ' '.join(r)
-
-DEPENDS = 'base-files base-passwd-3.5.7 \
-	busybox dropbear hotplug initscripts modutils netbase \
-	sysvinit tinylogin portmap \
-	modutils-initscripts \
-	${BOOTSTRAP_EXTRA_DEPENDS} \
-	${@bootstrap_modutils_depends(d)}'
-
-RDEPENDS = 'base-files base-passwd busybox \
-	hotplug initscripts \
-	netbase sysvinit tinylogin \
-	modutils-initscripts \
-	${BOOTSTRAP_EXTRA_RDEPENDS} \
-	${@bootstrap_modutils_rdepends(d)}'
-
-RRECOMMENDS = 'dropbear portmap \
-	${BOOTSTRAP_EXTRA_RRECOMMENDS}'
diff --git a/meta/task-dvb.bb b/meta/task-dvb.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/task-dvb.bb
diff --git a/meta/task-dvb.oe b/meta/task-dvb.oe
deleted file mode 100644
index 7c8d99447a..0000000000
--- a/meta/task-dvb.oe
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGES = task-dvb
-DESCRIPTION = "Meta-package for DVB application"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-ALLOW_EMPTY = 1
-PR = "r5"
-
-RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
-DEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-kernel"
diff --git a/meta/task-mythfront.bb b/meta/task-mythfront.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/task-mythfront.bb
diff --git a/meta/task-mythfront.oe b/meta/task-mythfront.oe
deleted file mode 100644
index 78e4081451..0000000000
--- a/meta/task-mythfront.oe
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGES = "${PN}"
-DESCRIPTION = "Meta-package for MythTV diskless frontend"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-ALLOW_EMPTY = 1
-PR = "r4"
-
-RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera libfontconfig-utils setserial snes9x ntp snes232 linux-input mythfront-config gpe-dm mythfront-session"
-DEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-kernel ttf-bitstream-vera setserial snes9x ntp snes232 linux-input mythfront-config gpe-dm mythfront-session"
diff --git a/meta/task-python-everything_0.9.0.bb b/meta/task-python-everything_0.9.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/task-python-everything_0.9.0.bb
diff --git a/meta/task-python-everything_0.9.0.oe b/meta/task-python-everything_0.9.0.oe
deleted file mode 100644
index 2a358b36a3..0000000000
--- a/meta/task-python-everything_0.9.0.oe
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION= "Everything Python"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r4"
-DEPENDS = "	python-ao 		\
-		python-constraint	\
-		python-crypto		\
-		python-dialog		\
-		python-egenix-mx-base   \
-		python-pycurl		\
-		python-fnorb		\
-		python-fpconst		\
-		python-gmpy		\
-		python-gnosis		\
-		python-hmm		\
-		python-irclib		\
-		python-logilab		\
-		python-mad		\
-		python-native		\
-		python-numeric		\
-		python-ogg		\
-		python-pexpect		\
-		python-pychecker	\
-		python-pycodes		\
-		python-pygame		\
-		python-pygoogle		\
-		python-pygtk		\
-		python-pylinda		\
-		python-pylint		\
-		python-pyqt		\
-		python-pyqwt		\
-		python-pyreverse	\
-		python-pyro		\
-		python-pyserial		\
-		python-pyxml		\
-		python-pyxmlrpc		\
-		python-quicklauncher    \
-		python-scapy		\
-		python-sip		\
-		python-sgmlop		\
-		python-snmplib		\
-		python-soappy		\
-		python-pysqlite		\
-		python-tlslite		\
-		python-urwid		\
-		python-vmaps		\
-		python-vorbis		\
-		moin			\
-		plone			\
-		twisted			\
-		zope"
-RDEPENDS=${DEPENDS}
-
-#fixme add python-pycap once libdnet is in again
-#fixme add python-pyx once kpathwhich-native is there
-#fixme add packages dynamically
-#fixme python-numarray doesn't work with soft-float
diff --git a/meta/task-xfce-base.bb b/meta/task-xfce-base.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/task-xfce-base.bb
diff --git a/meta/task-xterminal.bb b/meta/task-xterminal.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/task-xterminal.bb
diff --git a/meta/task-xterminal.oe b/meta/task-xterminal.oe
deleted file mode 100644
index fe66d8dd9b..0000000000
--- a/meta/task-xterminal.oe
+++ /dev/null
@@ -1,9 +0,0 @@
-PACKAGES = task-xterminal
-DESCRIPTION = "Meta-package for diskless X terminal"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-ALLOW_EMPTY = 1
-PR = "r0"
-
-RDEPENDS = "xserver-kdrive-fbdev minicom lrzsz dropbear"
-DEPENDS = "xserver-kdrive minicom lrzsz dropbear"
-
diff --git a/meta/twin-image.bb b/meta/twin-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/twin-image.bb
diff --git a/meta/uml-image.bb b/meta/uml-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/uml-image.bb
diff --git a/meta/unslung-able-image.bb b/meta/unslung-able-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-able-image.bb
diff --git a/meta/unslung-image.bb b/meta/unslung-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-image.bb
diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe
deleted file mode 100644
index 5238a2888f..0000000000
--- a/meta/unslung-image.oe
+++ /dev/null
@@ -1,2 +0,0 @@
-DEPENDS = "unslung-standard-image unslung-able-image"
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/unslung-standard-image.bb b/meta/unslung-standard-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-standard-image.bb
diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe
deleted file mode 100644
index e1e77396d4..0000000000
--- a/meta/unslung-standard-image.oe
+++ /dev/null
@@ -1,31 +0,0 @@
-PR = "r1"
-
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-UNSLUNG_BASE_DEPENDS = "slingbox ipkg wget"
-UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget"
-
-IMAGE_VARIANT ?= "standard"
-
-export IMAGE_BASENAME = "unslung-${IMAGE_VARIANT}"
-
-IPKG_INSTALL = "unslung-${IMAGE_VARIANT}-ramdisk \
-		${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_PACKAGES}"
-
-DEPENDS  = "unslung-${IMAGE_VARIANT}-kernel unslung-${IMAGE_VARIANT}-ramdisk \
-		${UNSLUNG_BASE_DEPENDS} ${UNSLUNG_EXTRA_DEPENDS}"
-
-RDEPENDS = "${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_RDEPENDS}"
-
-RRECOMMENDS = "${UNSLUNG_EXTRA_RRECOMMENDS}"
-
-IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
-		
-inherit image_ipk
-
-# Note that anything in this function must be repeatable without having to rebuild the rootfs
-unslung_clean_image () {
-	# Remove info from the local feed used to build the image
-	rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*
-}
diff --git a/meta/xbase-clients.bb b/meta/xbase-clients.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/xbase-clients.bb
diff --git a/meta/xterminal-image.bb b/meta/xterminal-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/xterminal-image.bb