DEPENDS cleanup of packages/meta. This doesn't fix all DEPENDS here but does remove a large chunk of the incorrect ones. Some entries that shouldn't be present have been marked FIXME as they indicate problems elsewhere in the metadata. Help from the opie/gpe gurus needed. I've not touched the NSLU code as I suspect they'd rather do this themselves?

20 files changed, 186 insertions, 343 deletions

diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb
index e8a20804a1..efd7430529 100644
--- a/packages/meta/meta-e-x11-core.bb
+++ b/packages/meta/meta-e-x11-core.bb
@@ -13,14 +13,10 @@ ALLOW_EMPTY = 1
 #
 # X
 #
-DEPENDS =                  "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
-                            ttf-bitstream-vera chkhinge"
-RDEPENDS_task-e-x11-core = "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
-                            ttf-bitstream-vera chkhinge"
+RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+                             ttf-bitstream-vera chkhinge"
 
 #
 # E-core
 #
-DEPENDS +=                  "entrance e-wm"
 RDEPENDS_task-e-x11-core += "entrance e-wm"
-
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 4a4c2c6b63..82a6055089 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -8,8 +8,6 @@ FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
 
 ALLOW_EMPTY = 1
 
-DEPENDS              = "task-e-x11-core entice eclair examine evidence e-modules"
-# e-utils elitaire
 RDEPENDS_task-e-x11  = "task-e-x11-core entice eclair examine evidence e-modules"
 # e-utils elitaire
 
diff --git a/packages/meta/meta-e.bb b/packages/meta/meta-e.bb
index 2bdb84ac51..e933cc7415 100644
--- a/packages/meta/meta-e.bb
+++ b/packages/meta/meta-e.bb
@@ -9,8 +9,7 @@ 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}"
+
 LICENSE = MIT
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 1ca5fd8c62..1e8c219929 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -5,24 +5,18 @@ PR="r1"
 
 ALLOW_EMPTY = 1
 
-gpe-task-apps-extra = "\
+RDEPENDS_gpe-task-apps-extra := "\
     gpe-filemanager \
     gpe-nmf \
     gpe-soundbite \
     mbmerlin"
 
-RDEPENDS_gpe-task-apps-extra := "${gpe-task-apps-extra}"
-DEPENDS += " ${gpe-task-apps-extra}"
-
-gpe-task-web = "\
+RDEPENDS_gpe-task-web := "\
     gpe-irc \
     minimo \
     gaim"
 
-RDEPENDS_gpe-task-web := "${gpe-task-web}"
-DEPENDS += " ${gpe-task-web}"
-
-gpe-task-desktopapps = "\
+RDEPENDS_gpe-task-desktopapps := "\
     firefox \
     thunderbird \
     galculator \
@@ -30,6 +24,4 @@ gpe-task-desktopapps = "\
     gpdf \
     totem"
 
-RDEPENDS_gpe-task-desktopapps := "${gpe-task-desktopapps}"
-DEPENDS += " ${gpe-task-desktopapps}"
 LICENSE = MIT
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index ae0fe753d1..3a3bb2261b 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -5,14 +5,12 @@ PR = "r41"
 
 ALLOW_EMPTY = "1"
 
-gpe-base-depends = "\
+RDEPENDS_gpe-base-depends := "\
     diet-x11 \
     virtual/xserver"
 
-RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
-DEPENDS += " ${gpe-base-depends}"
-
-gpe-task-base = "\
+RDEPENDS_gpe-task-base := "\
+    gpe-task-base = \
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
@@ -35,17 +33,14 @@ gpe-task-base = "\
     detect-stylus \
     suspend-desktop \
     teleport \
-    xauth"
-
-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 = "\
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+RDEPENDS_gpe-task-pim := "\
     gpe-timesheet \
     gpe-todo \
     gpe-calendar \
@@ -54,10 +49,7 @@ gpe-task-pim = "\
     gpe-today \
     gpesyncd"
 
-RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
-DEPENDS += " ${gpe-task-pim}"
-
-gpe-task-settings = "\
+RDEPENDS_gpe-task-settings := "\
     matchbox-panel-manager \
     gpe-bluetooth \
     gpe-beam \
@@ -74,10 +66,7 @@ gpe-task-settings = "\
     minimix \
     xmonobut"
 
-RDEPENDS_gpe-task-settings := "${gpe-task-settings}"
-DEPENDS += " ${gpe-task-settings}"
-
-gpe-task-apps = "\
+RDEPENDS_gpe-task-apps := "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
@@ -91,10 +80,7 @@ gpe-task-apps = "\
     gpe-soundbite \
     rosetta"
 
-RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
-DEPENDS += " ${gpe-task-apps}"
-
-gpe-task-games = "\
+RDEPENDS_gpe-task-games := "\
     gpe-go \
     gpe-lights \
     gpe-othello \
@@ -102,19 +88,12 @@ gpe-task-games = "\
     gsoko \
     xdemineur"
 
-RDEPENDS_gpe-task-games := "${gpe-task-games}"
-DEPENDS += " ${gpe-task-games}"
-
-gpe-task-connectivity = "\
-    gpe-mini-browser \
-"
-#    gaim \ 
-#    linphone-hh"
-
-RDEPENDS_gpe-task-connectivity := "${gpe-task-connectivity}"
-DEPENDS += " ${gpe-task-connectivity}"
-
+RDEPENDS_gpe-task-connectivity := "\
+    gpe-mini-browser"
+#    gaim
+#    linphone-hh
 
+# FIXME - Some dependencies are broken somewhere for this to be needed
 DEPENDS += "matchbox-themes-extra"
 
 LICENSE = "MIT"
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"
+
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index f82a69f367..a6af4fce16 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -192,14 +192,9 @@ task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-ticta
 # 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}"
+# FIXME - these shouldn't be here
+DEPENDS += "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
+            opie-sounds opie-ttf-support ttf-dejavu"
 
 RDEPENDS_task-opie-applets              = "${task-opie-applets}"
 RDEPENDS_task-opie-apps                 = "${task-opie-apps}"
diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb
index c631fa44c1..76fa01f069 100644
--- a/packages/meta/meta-sdl.bb
+++ b/packages/meta/meta-sdl.bb
@@ -5,22 +5,12 @@ PR = "r1"
 
 ALLOW_EMPTY = 1
 
-# no need to add libsdl as all libsdl-* already (r)depend on it
-task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net"
-task-sdl-base = ""
+# 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"
 
-task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
-task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"
+RDEPENDS_task-sdl-base = ""
 
+RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
 
-RDEPENDS_task-sdl-libs = "${task-sdl-libs}"
-DEPENDS += "${task-sdl-libs}"
+RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"
 
-RDEPENDS_task-sdl-base = "${task-sdl-base}"
-DEPENDS += "${task-sdl-base}"
-
-RDEPENDS_task-sdl-games = "${task-sdl-games}"
-DEPENDS += "${task-sdl-games}"
-
-RDEPENDS_task-sdl-emulators = "${task-sdl-emulators}"
-DEPENDS += "${task-sdl-emulators}"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index db9d86cdd6..01bd572730 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -5,14 +5,11 @@ PR = "r5"
 
 ALLOW_EMPTY = "1"
 
-gpe-base-depends = "\
+RDEPENDS_gpe-base-depends := "\
     diet-x11 \
     virtual/xserver"
 
-RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
-DEPENDS += " ${gpe-base-depends}"
-
-gpe-task-base = "\
+RDEPENDS_gpe-task-base := "\
     bluez-utils-dbus \
     matchbox \
     xcursor-transparent-theme \
@@ -30,22 +27,17 @@ gpe-task-base = "\
     gpe-confd \
     gpe-autostarter \
     libgtkstylus \
-    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}"
+    detect-stylus \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
 
-gpe-task-pim = "\
+RDEPENDS_gpe-task-pim := "\
     figment"
-RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
-DEPENDS += " ${gpe-task-pim}"
 
-gpe-task-settings = "\
+RDEPENDS_gpe-task-settings := "\
     matchbox-panel-manager \
     gpe-bluetooth \
     gpe-beam \
@@ -61,10 +53,7 @@ gpe-task-settings = "\
     minilite \
     xmonobut"
 
-RDEPENDS_gpe-task-settings := "${gpe-task-settings}"
-DEPENDS += " ${gpe-task-settings}"
-
-sectest-task-apps = "\
+RDEPENDS_sectest-task-apps := "\
     gpe-edit \
     gpe-calculator \
     gpe-clock \
@@ -85,12 +74,9 @@ sectest-task-apps = "\
     hydra \
     thcrut \
     driftnet \
-	miniclipboard"
-
-RDEPENDS_sectest-task-apps := "${sectest-task-apps}"
-DEPENDS += " ${sectest-task-apps}"
-
+    miniclipboard"
 
+# FIXME - we shouldn't need this. which packages don't set their dependencies correctly?
 DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
 
 LICENSE = "MIT"
diff --git a/packages/meta/nylon-image-extra.bb b/packages/meta/nylon-image-extra.bb
index b196a4276f..be20ddde78 100644
--- a/packages/meta/nylon-image-extra.bb
+++ b/packages/meta/nylon-image-extra.bb
@@ -2,14 +2,10 @@ include nylon-image-standard.bb
 
 export IMAGE_BASENAME = "nylon-extra"
  
-NYLON_EXTRA = "\
-	kismet \
-	netperf \
-	nylon-statistics \
-	openvpn \
-	"
+RDEPENDS = "\
+    kismet \
+    netperf \
+    nylon-statistics \
+    openvpn"
 
-DEPENDS += "${NYLON_EXTRA}"
-
-RDEPENDS += "${NYLON_EXTRA}"
 LICENSE = MIT
diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb
index 8435388174..c800fca9f1 100644
--- a/packages/meta/task-bootstrap-unionroot.bb
+++ b/packages/meta/task-bootstrap-unionroot.bb
@@ -15,16 +15,6 @@ PACKAGES = "${PN}"
 
 MODUTILS ?= "24 26"
 
-def bootstrap_modutils_depends(d):
-	import bb
-	m = bb.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 bb
         m = bb.data.getVar('MODUTILS', d, 1)
@@ -37,18 +27,6 @@ def bootstrap_modutils_rdepends(d):
 
 HOTPLUG ?= "linux-hotplug"
 
-DEPENDS = 'base-files base-passwd-3.5.7 \
-	busybox dropbear initscripts modutils netbase \
-	sysvinit tinylogin portmap \
-	modutils-initscripts \
-	${HOTPLUG} \
-	${BOOTSTRAP_EXTRA_DEPENDS} \
-	${@bootstrap_modutils_depends(d)} \
-	unionfs-modules \
-	unionfs-utils \
-	unionroot \
-	unionroot-utils'
-
 RDEPENDS = 'base-files base-passwd busybox \
 	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 31920135d4..ef76ec4345 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -11,16 +11,6 @@ PACKAGES = "${PN}"
 
 MODUTILS ?= "24 26"
 
-def bootstrap_modutils_depends(d):
-	import bb
-	m = bb.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 bb
         m = bb.data.getVar('MODUTILS', d, 1)
@@ -33,14 +23,6 @@ def bootstrap_modutils_rdepends(d):
 
 HOTPLUG ?= "linux-hotplug"
 
-DEPENDS = 'base-files base-passwd-3.5.9 \
-	busybox dropbear initscripts modutils netbase \
-	sysvinit tinylogin portmap psmisc setserial\
-	modutils-initscripts \
-	${HOTPLUG} \
-	${BOOTSTRAP_EXTRA_DEPENDS} \
-	${@bootstrap_modutils_depends(d)}'
-
 RDEPENDS = 'base-files base-passwd busybox \
 	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
diff --git a/packages/meta/task-dvb.bb b/packages/meta/task-dvb.bb
index 8be412611d..5a5c37a565 100644
--- a/packages/meta/task-dvb.bb
+++ b/packages/meta/task-dvb.bb
@@ -5,5 +5,5 @@ 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"
+
 LICENSE = MIT
diff --git a/packages/meta/task-mythfront.bb b/packages/meta/task-mythfront.bb
index 85aa7d6a80..7f2d84b86e 100644
--- a/packages/meta/task-mythfront.bb
+++ b/packages/meta/task-mythfront.bb
@@ -5,5 +5,5 @@ ALLOW_EMPTY = 1
 PR = "r6"
 
 RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera libfontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm"
-DEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-kernel ttf-bitstream-vera setserial snes9x ntp mythfront-config gpe-dm mythfront-session"
+
 LICENSE = MIT
diff --git a/packages/meta/task-pivotboot.bb b/packages/meta/task-pivotboot.bb
index 4f95d28e27..091f70f459 100644
--- a/packages/meta/task-pivotboot.bb
+++ b/packages/meta/task-pivotboot.bb
@@ -11,16 +11,6 @@ PACKAGES = "${PN}"
 
 MODUTILS ?= "24 26"
 
-def bootstrap_modutils_depends(d):
-	import bb
-	m = bb.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 bb
         m = bb.data.getVar('MODUTILS', d, 1)
@@ -33,13 +23,6 @@ def bootstrap_modutils_rdepends(d):
 
 HOTPLUG ?= "linux-hotplug"
 
-DEPENDS = 'base-files base-passwd-3.5.9 \
-	busybox modutils netbase \
-	modutils-initscripts \
-	${HOTPLUG} \
-	${PIVOTBOOT_EXTRA_DEPENDS} \
-	${@bootstrap_modutils_depends(d)}'
-
 RDEPENDS = 'base-files base-passwd busybox \
 	netbase modutils-initscripts \
 	${HOTPLUG} \
diff --git a/packages/meta/task-python-everything_1.0.0.bb b/packages/meta/task-python-everything_1.0.0.bb
index 32e36b9f52..705074a876 100644
--- a/packages/meta/task-python-everything_1.0.0.bb
+++ b/packages/meta/task-python-everything_1.0.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
 PR = "ml2"
 
-DEPENDS = "\
+RDEPENDS = "\
 		python-ao 		\
 		python-pybluez		\
 		python-constraint	\
@@ -64,7 +64,7 @@ DEPENDS = "\
 		plone			\
 		twisted			\
 		zope"
-RDEPENDS=${DEPENDS}
+
 
 #fixme add python-pycap once libdnet is in again
 #fixme add python-pyx once kpathwhich-native is there
diff --git a/packages/meta/task-python-sharprom_1.0.0.bb b/packages/meta/task-python-sharprom_1.0.0.bb
index 89d155b51d..aa1fc348bd 100644
--- a/packages/meta/task-python-sharprom_1.0.0.bb
+++ b/packages/meta/task-python-sharprom_1.0.0.bb
@@ -14,7 +14,7 @@ NONWORKING = "\
 		python-sgmlop		\
 		python-vorbis"
 
-DEPENDS = "\
+RDEPENDS = "\
 		python-ao 		\
 		python-pybluez		\
 		python-constraint	\
@@ -61,7 +61,6 @@ DEPENDS = "\
 		plone			\
 		twisted			\
 		zope"
-RDEPENDS=${DEPENDS}
 
 #fixme add python-pycap once libdnet is in again
 #fixme add python-pyx once kpathwhich-native is there
diff --git a/packages/meta/task-xfce-base.bb b/packages/meta/task-xfce-base.bb
index 2f565fd433..4c508ec7c5 100644
--- a/packages/meta/task-xfce-base.bb
+++ b/packages/meta/task-xfce-base.bb
@@ -7,9 +7,6 @@ ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
 PR = "r1"
 
-DEPENDS = "xfce-mcs-manager xfce-mcs-plugins xfwm4 xfce4-panel \
-	xfdesktop xfce-utils"
-
 RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
 	xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \
 	xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \
diff --git a/packages/meta/task-xterminal.bb b/packages/meta/task-xterminal.bb
index 656daad1c1..77eb094caa 100644
--- a/packages/meta/task-xterminal.bb
+++ b/packages/meta/task-xterminal.bb
@@ -5,6 +5,5 @@ ALLOW_EMPTY = 1
 PR = "r0"
 
 RDEPENDS = "xserver-kdrive-fbdev minicom lrzsz dropbear"
-DEPENDS = "xserver-kdrive minicom lrzsz dropbear"
 
 LICENSE = MIT
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index dc53858b47..5e0e590daf 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -5,12 +5,6 @@ PR = "r1"
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
 
-DEPENDS = 'xauth \
-	xhost \
-	xmodmap \
-	xrdb \
-	xset'
-
 RDEPENDS = 'xauth \
 	xhost \
 	xmodmap \