From a1c16de15880e79f2d35c150d4abf56a8220eb8f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 28 Aug 2010 12:16:21 -0700
Subject: recipes/tasks: Do not RDEPENDS on unavailable packages.

* Some packages are renamed so RDEPEND on those instead.
* Some packages are removed so remove then from RDEPENDS too.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.co
---
 recipes/tasks/task-mamona-base.bb              |  5 +++--
 recipes/tasks/task-mamona-python.bb            | 10 +---------
 recipes/tasks/task-mamona-systemtap.bb         |  1 -
 recipes/tasks/task-mamona-wm.bb                |  1 -
 recipes/tasks/task-openmoko-base.bb            |  2 +-
 recipes/tasks/task-openmoko-python-devel.bb    |  1 -
 recipes/tasks/task-opie-apps.bb                |  2 +-
 recipes/tasks/task-python-sharprom_20060425.bb | 18 +++++++++---------
 8 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb
index fa56e2459a..a909595f7a 100644
--- a/recipes/tasks/task-mamona-base.bb
+++ b/recipes/tasks/task-mamona-base.bb
@@ -9,14 +9,15 @@ RDEPENDS_${PN} = "\
   apt \
   base-files \
   base-passwd \
-  bash | bash-noemu \
+  bash \
+  bash-noemu \
   busybox \
   bzip2 \
   coreutils \
   dpkg \
   e2fsprogs \
   e2fsprogs-badblocks \
-  e2fsprogs-uuidgen \
+  util-linux-ng \
   file \
   gawk \
   gawk-common \
diff --git a/recipes/tasks/task-mamona-python.bb b/recipes/tasks/task-mamona-python.bb
index 4503627d28..8b19643be4 100644
--- a/recipes/tasks/task-mamona-python.bb
+++ b/recipes/tasks/task-mamona-python.bb
@@ -18,15 +18,12 @@ RDEPENDS_${PN} = "\
     python-gmpy	\
     python-gnosis \
     python-gst \
-    python-hmm \
     python-imaging \
     python-imdbpy \
     python-inotify \
     python-irclib \
-    python-itools \
     python-logilab-common \
     python-libgmail \
-    python-lightmediascanner \
     python-lxml	\
     python-mad \
     python-numarray	\
@@ -48,7 +45,6 @@ RDEPENDS_${PN} = "\
     python-pylint \
     python-pyqt	\
     python-pyraf \
-    python-pyreverse \
     python-pyrex \
     python-pyro \
     python-pyserial \
@@ -63,17 +59,13 @@ RDEPENDS_${PN} = "\
     python-simplejson \
     python-sip \
     python-sgmlop \
-    python-snmplib \
     python-soappy \
     python-spydi \
-    python-spyro \
     python-sqlalchemy \
     python-sqlobject \
     python-tlslite \
-    python-urwid \
-    python-vmaps \
+    python-twisted \
     python-vorbis \
     python-webpy \
     task-python-efl \
-    twisted \
 "
diff --git a/recipes/tasks/task-mamona-systemtap.bb b/recipes/tasks/task-mamona-systemtap.bb
index 84182d6573..72a362243d 100644
--- a/recipes/tasks/task-mamona-systemtap.bb
+++ b/recipes/tasks/task-mamona-systemtap.bb
@@ -6,6 +6,5 @@ PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
     libcap \
-    systemtap \
     task-mamona-sdk \
 "
diff --git a/recipes/tasks/task-mamona-wm.bb b/recipes/tasks/task-mamona-wm.bb
index 49d3a6a8ab..e2ac61284d 100644
--- a/recipes/tasks/task-mamona-wm.bb
+++ b/recipes/tasks/task-mamona-wm.bb
@@ -12,6 +12,5 @@ RDEPENDS_${PN} = "\
     libmamona-im-gtk \
     pango-module-basic-x \
     pango-module-basic-fc \
-    aterm \
     midori \
 "
diff --git a/recipes/tasks/task-openmoko-base.bb b/recipes/tasks/task-openmoko-base.bb
index b7b7b58ee4..3c46c56f5e 100644
--- a/recipes/tasks/task-openmoko-base.bb
+++ b/recipes/tasks/task-openmoko-base.bb
@@ -11,7 +11,7 @@ inherit task
 DESCRIPTION_task-openmoko-base = "Openmoko: Top Panel, Application Launcher, Application Manager"
 RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
-  matchbox-panel-2-applets \
+#  matchbox-panel-2-applets \
 #  matchbox-keyboard-inputmethod \
 #  matchbox-keyboard-im \
 #  matchbox-keyboard-applet \
diff --git a/recipes/tasks/task-openmoko-python-devel.bb b/recipes/tasks/task-openmoko-python-devel.bb
index a493183865..7b375c0617 100644
--- a/recipes/tasks/task-openmoko-python-devel.bb
+++ b/recipes/tasks/task-openmoko-python-devel.bb
@@ -8,5 +8,4 @@ inherit task
 RDEPENDS_task-openmoko-python-devel = "\
   task-python-efl \
   python-pygtk \
-  python-lightmediascanner \
 "
diff --git a/recipes/tasks/task-opie-apps.bb b/recipes/tasks/task-opie-apps.bb
index 2f9cc27962..f791c21713 100644
--- a/recipes/tasks/task-opie-apps.bb
+++ b/recipes/tasks/task-opie-apps.bb
@@ -8,7 +8,7 @@ PACKAGES = "task-opie-apps task-opie-extra-apps"
 
 RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
                   opie-checkbook opie-clock \
-                  opie-console opie-dagger opie-embeddedkonsole \
+                  opie-console 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 \
diff --git a/recipes/tasks/task-python-sharprom_20060425.bb b/recipes/tasks/task-python-sharprom_20060425.bb
index 16038adaa9..15776eaf8c 100644
--- a/recipes/tasks/task-python-sharprom_20060425.bb
+++ b/recipes/tasks/task-python-sharprom_20060425.bb
@@ -8,13 +8,20 @@ NONWORKING = "\
 		python-crypto		\
 		python-gammu		\
 		python-gmpy		\
+		python-hmm		\
+		python-itools		\
 		python-pybluez		\
+		python-pyreverse	\
 		python-pysqlite		\
 		python-pygtk		\
 		python-pyqwt		\
+		python-snmplib		\
 		python-sgmlop		\
+		python-spyro		\
 		python-sword            \
-		python-vorbis"
+		python-urwid		\
+		python-vorbis		\
+		python-vmaps"
 
 RDEPENDS_${PN} = "\
 		python-ao 		\
@@ -23,9 +30,7 @@ RDEPENDS_${PN} = "\
 		python-fnorb		\
 		python-fpconst		\
 		python-gnosis		\
-		python-hmm		\
 		python-irclib		\
-		python-itools		\
 		python-libgmail		\
 		python-logilab-common	\
 		python-lxml		\
@@ -45,7 +50,6 @@ RDEPENDS_${PN} = "\
 		python-pylint		\
 		python-pyqt		\
 		python-pyraf		\
-		python-pyreverse	\
 		python-pyro		\
 		python-pyserial		\
 		python-pyvisa		\
@@ -55,17 +59,13 @@ RDEPENDS_${PN} = "\
 		python-scapy		\
 		python-scons		\
 		python-sip		\
-		python-snmplib		\
 		python-soappy		\
 		python-spydi		\
-		python-spyro		\
 		python-tlslite		\
-		python-urwid		\
-		python-vmaps		\
+		python-twisted		\
 		python-webpy		\
 		moin			\
 		plone			\
-		twisted			\
 		zope"
 
 #fixme add python-egenix-mx-base if brought in from nonworking
-- 
cgit 1.2.3-korg