recipes: conform to OE packaging guidelines with RDEPENDS/RRECOMMENDS

* there is probably very few cases when it's needed without _${PN},
  if you find one in attached patch, please enlighten me
* usually we want those only for ${PN} not for all ${PACKAGES} ie ${PN}-dev, ${PN)-doc etc
* there is a check for this in recipe-sanity.bclass
* there is maybe few possible fixes also in bbclasses
  cpan-base.bbclass:RDEPENDS  += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
  distutils-base.bbclass:RDEPENDS += "python-core"
  gtk-icon-cache.bbclass:RDEPENDS += "hicolor-icon-theme"
  image.bbclass:RDEPENDS += "${IMAGE_INSTALL} ${IMAGE_BOOT}"
  module.bbclass:RDEPENDS += "kernel (${KERNEL_VERSION}) update-modules"
  ?opie_i18n.bbclass:      rdepends =  bb.data.getVar("RDEPENDS", d, 1)
  ?opie_i18n.bbclass:                      bb.data.setVar('RDEPENDS_%s' % x[0].lower(), pn, d)
  ?opie_i18n.bbclass:              bb.data.setVar('RDEPENDS', rdepends, d)
  rubyextension.bbclass:RDEPENDS += "ruby"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <k-kooi@ti.com>

17 files changed, 18 insertions, 18 deletions

diff --git a/recipes/nonworking/e2fsprogs/e2fsprogs.inc b/recipes/nonworking/e2fsprogs/e2fsprogs.inc
index 119efb05ca..f9dae6ecf0 100644
--- a/recipes/nonworking/e2fsprogs/e2fsprogs.inc
+++ b/recipes/nonworking/e2fsprogs/e2fsprogs.inc
@@ -106,7 +106,7 @@ pkg_prerm_e2fsprogs-mke2fs () {
 }
 
 # blkid used to be part of e2fsprogs but is useful outside, add it
-# as an RDEPENDS so that anything relying on it being in e2fsprogs
+# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs
 # still works
 RDEPENDS_e2fsprogs = "util-linux-ng e2fsprogs-badblocks"
 
diff --git a/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb b/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb
index c35193dcee..13b015489b 100644
--- a/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb
+++ b/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -30,7 +30,7 @@ do_stage () {
 }
 
 # blkid used to be part of e2fsprogs but is useful outside, add it
-# as an RDEPENDS so that anything relying on it being in e2fsprogs
+# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs
 # still works
 RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
 
diff --git a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
index 240a678b47..e65c15c034 100644
--- a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
+++ b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
@@ -4,7 +4,7 @@ PR ="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 EXTRA_OECONF += "--enable-hildon"
 
diff --git a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
index 63a8864a29..e8ccced4e3 100644
--- a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
+++ b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
@@ -4,7 +4,7 @@ PR ="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 EXTRA_OECONF += "--enable-hildon"
 
diff --git a/recipes/nonworking/gpe-contacts/gpe-contacts.inc b/recipes/nonworking/gpe-contacts/gpe-contacts.inc
index e6af955190..b98d6b36d9 100644
--- a/recipes/nonworking/gpe-contacts/gpe-contacts.inc
+++ b/recipes/nonworking/gpe-contacts/gpe-contacts.inc
@@ -5,7 +5,7 @@ PR = "r0"
 
 DEPENDS = "libgpewidget libdisplaymigration libgpevtype dbus"
 SECTION = "gpe"
-RDEPENDS = "gpe-icons"
+RDEPENDS_${PN} = "gpe-icons"
 DESCRIPTION = "GPE contacts manager"
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 
diff --git a/recipes/nonworking/greader/greader_0.61.bb b/recipes/nonworking/greader/greader_0.61.bb
index a75d208ccf..d3a1459966 100644
--- a/recipes/nonworking/greader/greader_0.61.bb
+++ b/recipes/nonworking/greader/greader_0.61.bb
@@ -3,7 +3,7 @@ inherit autotools gpe
 DESCRIPTION = "GReader"
 DEPENDS = "libgpewidget zlib"
 SECTION = "gpe/applications"
-#RDEPENDS = "gpe-icons"
+#RDEPENDS_${PN} = "gpe-icons"
 
 SRC_URI = "http://handhelds.org/~gberenfield/${PN}_${PV}_src.tgz \
            file://greader.patch"
diff --git a/recipes/nonworking/icecast/icecast_2.2.0.bb b/recipes/nonworking/icecast/icecast_2.2.0.bb
index 0d7f06a7aa..59f607c310 100644
--- a/recipes/nonworking/icecast/icecast_2.2.0.bb
+++ b/recipes/nonworking/icecast/icecast_2.2.0.bb
@@ -3,9 +3,9 @@ LICENSE = "GPLv2"
 
 DEPENDS = "libvorbis libogg libxslt"
 
-# The RDEPENDS line is a workaround to make sure
+# The RDEPENDS_${PN} line is a workaround to make sure
 # icecast pulls in necessary library deps.
-RDEPENDS = "libvorbis libogg libxslt"
+RDEPENDS_${PN} = "libvorbis libogg libxslt"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/icecast/${PN}-${PV}.tar.gz"
 
diff --git a/recipes/nonworking/imkit/imkit_0.4.5.bb b/recipes/nonworking/imkit/imkit_0.4.5.bb
index 90d41fae86..1a735aaf15 100644
--- a/recipes/nonworking/imkit/imkit_0.4.5.bb
+++ b/recipes/nonworking/imkit/imkit_0.4.5.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "An Inputmethod for Opie - frontend to the japanese anthy engine"
 HOMEPAGE = "http://zaurus-ja.sourceforge.jp/imkit-anthy.html.en"
 SECTION = "opie/inputmethods"
 LICENSE = "GPL"
-RDEPENDS = "anthy"
+RDEPENDS_${PN} = "anthy"
 
 SRC_URI = "http://downloads.sourceforge.jp/zaurus-ja/9316/imkit-0.4.5.tar.gz"
 S = "${WORKDIR}/imkit-${PV}"
diff --git a/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb b/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb
index 52f5d9d5a5..728ea1b135 100644
--- a/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb
+++ b/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
 LICENSE = "GPL"
 KV = "${PV}"
-RDEPENDS = "mtd-utils"
+RDEPENDS_${PN} = "mtd-utils"
 PR ="r2"
 
 SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \
diff --git a/recipes/nonworking/meta/meta-gpephone.bb b/recipes/nonworking/meta/meta-gpephone.bb
index 9c11890d0e..0a80341546 100644
--- a/recipes/nonworking/meta/meta-gpephone.bb
+++ b/recipes/nonworking/meta/meta-gpephone.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages"
 LICENSE = "MIT"
 PR = "r1"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     gpephone-task-base \
     gpephone-task-settings \
     gpephone-task-pim \
diff --git a/recipes/nonworking/meta/meta-sectest-gpe.bb b/recipes/nonworking/meta/meta-sectest-gpe.bb
index b8f88158d8..288f0fb923 100644
--- a/recipes/nonworking/meta/meta-sectest-gpe.bb
+++ b/recipes/nonworking/meta/meta-sectest-gpe.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image"
 LICENSE = "MIT"
 PR = "r6"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     gpe-task-base \
     gpe-base-depends \
     gpe-task-base \
diff --git a/recipes/nonworking/monotone-viz/monotone-viz_0.11.bb b/recipes/nonworking/monotone-viz/monotone-viz_0.11.bb
index de779585de..968c93e847 100644
--- a/recipes/nonworking/monotone-viz/monotone-viz_0.11.bb
+++ b/recipes/nonworking/monotone-viz/monotone-viz_0.11.bb
@@ -1,6 +1,6 @@
 DESCRIPTION =	"Monotone-viz is a small GTK+ application that visualizes monotone ancestry graphs."
 DEPENDS =	"gtk+ libgnomecanvas lablgtk sqlite3 ocaml-cross"
-RDEPENDS =	"graphviz"
+RDEPENDS_${PN} =	"graphviz"
 
 
 SRC_URI =	"http://oandrieu.nerim.net/monotone-viz/archive/monotone-viz-0.11.tar.gz"
diff --git a/recipes/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb b/recipes/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
index 95a41a5317..ca6e9a2f0a 100644
--- a/recipes/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
+++ b/recipes/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/codecs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "opie-mediaplayer1"
-RDEPENDS = "opie-mediaplayer1"
+RDEPENDS_${PN} = "opie-mediaplayer1"
 PV = "${OPIE_CVS_PV}"
 APPNAME = "mpeg3plugin"
 
diff --git a/recipes/nonworking/pixdev/pixdev-stable_0.1.bb b/recipes/nonworking/pixdev/pixdev-stable_0.1.bb
index 405b802d92..59e2a73c43 100644
--- a/recipes/nonworking/pixdev/pixdev-stable_0.1.bb
+++ b/recipes/nonworking/pixdev/pixdev-stable_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Pixil Operating Environment"
 SECTION = "gui"
 PRIORITY = "optional"
 DEPENDS = "microwindows"
-RDEPENDS = "microwindows"
+RDEPENDS_${PN} = "microwindows"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pixdev/pixdev-stable-${PV}.tar.gz \
           file://${FILESDIR}/braces.patch"
diff --git a/recipes/nonworking/python/python-gsl_0.2.0.bb b/recipes/nonworking/python/python-gsl_0.2.0.bb
index 7673f23875..8f94f5a48d 100644
--- a/recipes/nonworking/python/python-gsl_0.2.0.bb
+++ b/recipes/nonworking/python/python-gsl_0.2.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU Scientific Library Python Bindings"
 SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "gsl"
-RDEPENDS = "python-core gsl"
+RDEPENDS_${PN} = "python-core gsl"
 SRCNAME = "pygsl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
diff --git a/recipes/nonworking/python/python-pyx_0.6.bb b/recipes/nonworking/python/python-pyx_0.6.bb
index 53a079663d..d422805cf4 100644
--- a/recipes/nonworking/python/python-pyx_0.6.bb
+++ b/recipes/nonworking/python/python-pyx_0.6.bb
@@ -3,7 +3,7 @@ It provides both an abstraction of PostScript and a TeX/LaTeX interface. Complex
 2d and 3d plots in publication-ready quality are built out of these primitives."
 SECTION = "devel/python"
 PRIORITY = "optional"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 DEPENDS = "kpsewhich-native"
 SRCNAME = "PyX"
 
diff --git a/recipes/nonworking/python/python-sword_1.5.10.bb b/recipes/nonworking/python/python-sword_1.5.10.bb
index 744c53dc6e..bb419934ec 100644
--- a/recipes/nonworking/python/python-sword_1.5.10.bb
+++ b/recipes/nonworking/python/python-sword_1.5.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python bindings for the sword library"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python-core sword"
+RDEPENDS_${PN} = "python-core sword"
 DEPENDS = "sword-${PV} swig-native"
 SRCNAME = "sword"
 PR = "r0"