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>

62 files changed, 62 insertions, 63 deletions

diff --git a/recipes/python/pydes_1.3.1.bb b/recipes/python/pydes_1.3.1.bb
index b63c59b9d5..7a12a35eaf 100644
--- a/recipes/python/pydes_1.3.1.bb
+++ b/recipes/python/pydes_1.3.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python DES implementation"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python"
+RDEPENDS_${PN} = "python"
 
 PR = "r1"
 ARCH_pydes = "all"
diff --git a/recipes/python/pyring_1.1.10.bb b/recipes/python/pyring_1.1.10.bb
index 7bd5d6b759..4d2e413159 100644
--- a/recipes/python/pyring_1.1.10.bb
+++ b/recipes/python/pyring_1.1.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python keyring"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python python-pygtk python-xml python-netclient python-numeric pydes"
+RDEPENDS_${PN} = "python python-pygtk python-xml python-netclient python-numeric pydes"
 
 ARCH_pyring = "all"
 
diff --git a/recipes/python/python-blipapi_0.02.04.bb b/recipes/python/python-blipapi_0.02.04.bb
index 4fcb2b1d96..6324ad3945 100644
--- a/recipes/python/python-blipapi_0.02.04.bb
+++ b/recipes/python/python-blipapi_0.02.04.bb
@@ -3,7 +3,7 @@ AUTHOR = "Marcin Sztolcman <marcin@urzenia.net>"
 HOMEPAGE = "http://blipapi.googlecode.com/"
 DEPENDS = "python-setuptools"
 LICENSE = "GPL"
-RDEPENDS += "python-json"
+RDEPENDS_${PN} += "python-json"
 PR = "r0"
 inherit setuptools
 
diff --git a/recipes/python/python-cheetah_2.0.1.bb b/recipes/python/python-cheetah_2.0.1.bb
index 82d7bbfccd..def89ebeb6 100644
--- a/recipes/python/python-cheetah_2.0.1.bb
+++ b/recipes/python/python-cheetah_2.0.1.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-pickle python-pprint"
+RDEPENDS_${PN} = "python-pickle python-pprint"
 
 SRC_URI[md5sum] = "7845a2950ea850a13c488a26b61ac50a"
 SRC_URI[sha256sum] = "70b618a03506831f59ba1ff8433907ee8d4ead5fc9f1b3f610d384e08a26938c"
diff --git a/recipes/python/python-cython-native_0.10.3.bb b/recipes/python/python-cython-native_0.10.3.bb
index a5c78cebe2..d7867c49e0 100644
--- a/recipes/python/python-cython-native_0.10.3.bb
+++ b/recipes/python/python-cython-native_0.10.3.bb
@@ -1,7 +1,7 @@
 require python-cython_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
     BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-cython-native_0.12.1.bb b/recipes/python/python-cython-native_0.12.1.bb
index 95886aecb0..d42d1fdd7b 100644
--- a/recipes/python/python-cython-native_0.12.1.bb
+++ b/recipes/python/python-cython-native_0.12.1.bb
@@ -1,7 +1,7 @@
 require python-cython_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
     PYTHONPATH=${STAGING_BINDIR} BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-cython-native_0.12.bb b/recipes/python/python-cython-native_0.12.bb
index 95886aecb0..d42d1fdd7b 100644
--- a/recipes/python/python-cython-native_0.12.bb
+++ b/recipes/python/python-cython-native_0.12.bb
@@ -1,7 +1,7 @@
 require python-cython_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
     PYTHONPATH=${STAGING_BINDIR} BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-daap_0.7.1.bb b/recipes/python/python-daap_0.7.1.bb
index 806297ff3d..a16573a44f 100644
--- a/recipes/python/python-daap_0.7.1.bb
+++ b/recipes/python/python-daap_0.7.1.bb
@@ -8,7 +8,7 @@ inherit distutils
 SRC_URI = "http://jerakeen.org/files/PythonDaap-${PV}.tar.gz"
 S = "${WORKDIR}/PythonDaap-${PV}"
 
-RDEPENDS = "python-compression"
+RDEPENDS_${PN} = "python-compression"
 
 
 SRC_URI[md5sum] = "b3db3d60b0ee83f5f23101d2c3bb99e0"
diff --git a/recipes/python/python-ecore_svn.bb b/recipes/python/python-ecore_svn.bb
index 94daaf1dd4..ed8a0cae88 100644
--- a/recipes/python/python-ecore_svn.bb
+++ b/recipes/python/python-ecore_svn.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "python-evas ecore"
-RDEPENDS += "python-evas"
+RDEPENDS_${PN} += "python-evas"
 
 do_stage() {
     distutils_stage_all
diff --git a/recipes/python/python-edbus_svn.bb b/recipes/python/python-edbus_svn.bb
index 00fffeda74..799ba18eee 100644
--- a/recipes/python/python-edbus_svn.bb
+++ b/recipes/python/python-edbus_svn.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edbus python-dbus"
-RDEPENDS += "python-dbus"
+RDEPENDS_${PN} += "python-dbus"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/recipes/python/python-edje_svn.bb b/recipes/python/python-edje_svn.bb
index 793db0c437..09cfbb01c3 100644
--- a/recipes/python/python-edje_svn.bb
+++ b/recipes/python/python-edje_svn.bb
@@ -1,6 +1,6 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edje python-evas"
-RDEPENDS += "python-evas"
+RDEPENDS_${PN} += "python-evas"
 
 SRC_URI += "file://0001-fix-unicode-conversion.patch"
diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc
index 9ed7a4cb98..d8559eab5b 100644
--- a/recipes/python/python-efl.inc
+++ b/recipes/python/python-efl.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 # we need to build pyrex otherwise cython doesn't get called to build
 # the extension modules.
 DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
-RDEPENDS += "python-lang"
+RDEPENDS_${PN} += "python-lang"
 PV = "0.3.1+svnr${SRCPV}"
 PR = "ml0"
 
diff --git a/recipes/python/python-elementary_svn.bb b/recipes/python/python-elementary_svn.bb
index ad82e04813..72948c07ae 100644
--- a/recipes/python/python-elementary_svn.bb
+++ b/recipes/python/python-elementary_svn.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "elementary"
-RDEPENDS += "python-evas python-ecore python-edje" 
+RDEPENDS_${PN} += "python-evas python-ecore python-edje" 
 PV = "0.1+svnr${SRCPV}"
 PR = "ml0"
 
diff --git a/recipes/python/python-emotion_svn.bb b/recipes/python/python-emotion_svn.bb
index 38e1355ff4..9f558f868e 100644
--- a/recipes/python/python-emotion_svn.bb
+++ b/recipes/python/python-emotion_svn.bb
@@ -1,4 +1,4 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "emotion python-evas"
-RDEPENDS += "python-ecore"
+RDEPENDS_${PN} += "python-ecore"
diff --git a/recipes/python/python-fam_1.1.1.bb b/recipes/python/python-fam_1.1.1.bb
index e7ff4bb785..b8ceadaedd 100644
--- a/recipes/python/python-fam_1.1.1.bb
+++ b/recipes/python/python-fam_1.1.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
 inherit distutils
 
-RDEPENDS = "fam python-core python-io"
+RDEPENDS_${PN} = "fam python-core python-io"
 
 
 SRC_URI[md5sum] = "f6c760c6d8e5ea69a3fce029f7973558"
diff --git a/recipes/python/python-gdata_1.2.4.bb b/recipes/python/python-gdata_1.2.4.bb
index 6c857260de..6e74f60e5b 100644
--- a/recipes/python/python-gdata_1.2.4.bb
+++ b/recipes/python/python-gdata_1.2.4.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/gdata.py-${PV}"
 
 FILES_${PN} += "${datadir}"
 
-RDEPENDS = "python-elementtree"
+RDEPENDS_${PN} = "python-elementtree"
 
 
 SRC_URI[md5sum] = "521f33a377d64f8a6505ba119415b787"
diff --git a/recipes/python/python-imaging_1.1.6.bb b/recipes/python/python-imaging_1.1.6.bb
index cf8f348edf..3cf8760ed1 100644
--- a/recipes/python/python-imaging_1.1.6.bb
+++ b/recipes/python/python-imaging_1.1.6.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "freetype jpeg tiff"
-RDEPENDS = "python-lang python-stringold"
+RDEPENDS_${PN} = "python-lang python-stringold"
 SRCNAME = "Imaging"
 PR = "ml1"
 
diff --git a/recipes/python/python-iniparse-native_0.2.3.bb b/recipes/python/python-iniparse-native_0.2.3.bb
index 68dd2184a8..8c17505de9 100644
--- a/recipes/python/python-iniparse-native_0.2.3.bb
+++ b/recipes/python/python-iniparse-native_0.2.3.bb
@@ -1,7 +1,7 @@
 require python-iniparse_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 PR = "r1"
 
 do_stage() {
diff --git a/recipes/python/python-libgmail_0.1.11.bb b/recipes/python/python-libgmail_0.1.11.bb
index 308652a89e..644f3b819a 100644
--- a/recipes/python/python-libgmail_0.1.11.bb
+++ b/recipes/python/python-libgmail_0.1.11.bb
@@ -19,7 +19,7 @@ do_install() {
 	done
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-core \
   python-netclient \
   python-email \
diff --git a/recipes/python/python-netfilter_0.5.5.bb b/recipes/python/python-netfilter_0.5.5.bb
index 3722625b01..4537d78067 100644
--- a/recipes/python/python-netfilter_0.5.5.bb
+++ b/recipes/python/python-netfilter_0.5.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python module to manage netfilter rules"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "iptables iptables-utils python-logging python-shell python-subprocess"
+RDEPENDS_${PN} = "iptables iptables-utils python-logging python-shell python-subprocess"
 SRCNAME = "python-netfilter"
 PR = "ml0"
 
diff --git a/recipes/python/python-pexpect_2.3.bb b/recipes/python/python-pexpect_2.3.bb
index 329e13b9bf..a661c21079 100644
--- a/recipes/python/python-pexpect_2.3.bb
+++ b/recipes/python/python-pexpect_2.3.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-core \
   python-io \
   python-terminal \
diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb
index 1cf705a05f..492f80348c 100644
--- a/recipes/python/python-phoneutils_git.bb
+++ b/recipes/python/python-phoneutils_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python Bindings for libphone-utils"
 SECTION = "devel/python"
 DEPENDS = "libphone-utils python-cython-native python-pyrex-native"
-RDEPENDS = "libphone-utils"
+RDEPENDS_${PN} = "libphone-utils"
 
 SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd"
 PV = "0.0.2+gitr${SRCPV}"
diff --git a/recipes/python/python-psyco_1.6.bb b/recipes/python/python-psyco_1.6.bb
index 7cc09bbf21..f916fb842f 100644
--- a/recipes/python/python-psyco_1.6.bb
+++ b/recipes/python/python-psyco_1.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://psyco.sourceforge.net"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 SRCNAME = "psyco"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}-src.tar.gz"
diff --git a/recipes/python/python-pycap_0.1.6.bb b/recipes/python/python-pycap_0.1.6.bb
index 0757d5f884..61d4b53dda 100644
--- a/recipes/python/python-pycap_0.1.6.bb
+++ b/recipes/python/python-pycap_0.1.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python Packet Capture Library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 DEPENDS = "libpcap libnet"
 SRCNAME = "pycap"
 PR = "r1"
diff --git a/recipes/python/python-pycups_1.9.45.bb b/recipes/python/python-pycups_1.9.45.bb
index 145cd7c47f..66afd92dc5 100644
--- a/recipes/python/python-pycups_1.9.45.bb
+++ b/recipes/python/python-pycups_1.9.45.bb
@@ -13,7 +13,7 @@ inherit distutils
 # used during compilation
 CFLAGS += -DVERSION=\\"${PV}\\"
 
-RDEPENDS = "python-core cups"
+RDEPENDS_${PN} = "python-core cups"
 
 SRC_URI[md5sum] = "ff634a6751f8a859ed26751bf03abef0"
 SRC_URI[sha256sum] = "ef6e576e5465da9c338ac8ff9f162825cfb7997359efc52e6a110c295a9f363b"
diff --git a/recipes/python/python-pycurl_7.18.2.bb b/recipes/python/python-pycurl_7.18.2.bb
index c66e94cbe9..401a46cc51 100644
--- a/recipes/python/python-pycurl_7.18.2.bb
+++ b/recipes/python/python-pycurl_7.18.2.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-core curl (>=${PV})"
+RDEPENDS_${PN} = "python-core curl (>=${PV})"
 
 SRC_URI[md5sum] = "39210d56f1d5a75ac8dd6a2866a93dd5"
 SRC_URI[sha256sum] = "95d21bd61e03d22ee4ac18fc0b9040c163cb504c4b2cf1dc43c18f32508f6736"
diff --git a/recipes/python/python-pycurl_7.19.0.bb b/recipes/python/python-pycurl_7.19.0.bb
index 3551b32b28..716098550d 100644
--- a/recipes/python/python-pycurl_7.19.0.bb
+++ b/recipes/python/python-pycurl_7.19.0.bb
@@ -16,4 +16,4 @@ SRC_URI[archive.sha256sum] = "eb782dfcc5a7c023539a077462b83c167e178128ee9f720166
 
 inherit distutils
 
-RDEPENDS = "python-core curl"
+RDEPENDS_${PN} = "python-core curl"
diff --git a/recipes/python/python-pyfits_1.3.bb b/recipes/python/python-pyfits_1.3.bb
index ea99a4692c..bf5f0777d8 100644
--- a/recipes/python/python-pyfits_1.3.bb
+++ b/recipes/python/python-pyfits_1.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "PyFITS provides an interface to FITS formatted files under the Python scripting language."
 HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
 AUTHOR = "Space Telescope Science Institute"
-RDEPENDS = "python-numpy"
+RDEPENDS_${PN} = "python-numpy"
 SECTION = "devel/python"
 LICENSE = "AURA"
 PR = "ml0"
diff --git a/recipes/python/python-pyftpdlib_0.5.1.bb b/recipes/python/python-pyftpdlib_0.5.1.bb
index b2ee723f93..1cee0752fd 100644
--- a/recipes/python/python-pyftpdlib_0.5.1.bb
+++ b/recipes/python/python-pyftpdlib_0.5.1.bb
@@ -9,7 +9,7 @@ inherit distutils
 SRC_URI = "http://pyftpdlib.googlecode.com/files/pyftpdlib-${PV}.tar.gz"
 S = "${WORKDIR}/pyftpdlib-${PV}"
 
-RDEPENDS = "python-netserver"
+RDEPENDS_${PN} = "python-netserver"
 
 SRC_URI[md5sum] = "f64ac67ebec1d8ab47c0766082617384"
 SRC_URI[sha256sum] = "6daed9475412eaab232e021ed76568c6520dacd75c58da406454139bef95c393"
diff --git a/recipes/python/python-pygame_1.9.1.bb b/recipes/python/python-pygame_1.9.1.bb
index bbeedda3a9..dba915f2cf 100644
--- a/recipes/python/python-pygame_1.9.1.bb
+++ b/recipes/python/python-pygame_1.9.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.pygame.org"
 LICENSE = "LGPL"
 DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}"
-RDEPENDS = "python-numeric"
+RDEPENDS_${PN} = "python-numeric"
 SRCNAME = "pygame"
 PR = "ml4"
 
diff --git a/recipes/python/python-pygoogle_0.6.bb b/recipes/python/python-pygoogle_0.6.bb
index 69ee9f83f2..29e6d6314b 100644
--- a/recipes/python/python-pygoogle_0.6.bb
+++ b/recipes/python/python-pygoogle_0.6.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 HOMEPAGE = "http://pygoogle.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "PSF"
-RDEPENDS = "python-soappy"
+RDEPENDS_${PN} = "python-soappy"
 SRCNAME = "pygoogle"
 PR = "ml1"
 
diff --git a/recipes/python/python-pygtk-1.2_0.6.12.bb b/recipes/python/python-pygtk-1.2_0.6.12.bb
index f8dcdd0bd9..c8410bf5a7 100644
--- a/recipes/python/python-pygtk-1.2_0.6.12.bb
+++ b/recipes/python/python-pygtk-1.2_0.6.12.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gtk+-1.2"
-RDEPENDS = "python-shell python-re"
+RDEPENDS_${PN} = "python-shell python-re"
 SRCNAME = "pygtk"
 PR = "r3"
 
diff --git a/recipes/python/python-pygtk_2.10.4.bb b/recipes/python/python-pygtk_2.10.4.bb
index daf854cfa5..cab2d7b7e9 100644
--- a/recipes/python/python-pygtk_2.10.4.bb
+++ b/recipes/python/python-pygtk_2.10.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
 DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
-RDEPENDS = "python-shell python-pycairo python-pygobject"
+RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
diff --git a/recipes/python/python-pygtk_2.16.0.bb b/recipes/python/python-pygtk_2.16.0.bb
index eaea9af4bb..40a8be2040 100644
--- a/recipes/python/python-pygtk_2.16.0.bb
+++ b/recipes/python/python-pygtk_2.16.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
 DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
-RDEPENDS = "python-shell python-pycairo python-pygobject"
+RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
diff --git a/recipes/python/python-pygtk_2.6.3.bb b/recipes/python/python-pygtk_2.6.3.bb
index e37fe1fb34..73565f51cc 100644
--- a/recipes/python/python-pygtk_2.6.3.bb
+++ b/recipes/python/python-pygtk_2.6.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
 DEPENDS = "gtk+-2.6.10 libglade"
-RDEPENDS = "python-shell"
+RDEPENDS_${PN} = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
 PR = "ml1"
diff --git a/recipes/python/python-pygtk_2.8.6.bb b/recipes/python/python-pygtk_2.8.6.bb
index a96cca7ddd..c595ef448f 100644
--- a/recipes/python/python-pygtk_2.8.6.bb
+++ b/recipes/python/python-pygtk_2.8.6.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 # needs gtk+ 2.8.x
 DEPENDS = "gtk+-2.8.16 libglade"
-RDEPENDS = "python-shell"
+RDEPENDS_${PN} = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
 PR = "r2"
diff --git a/recipes/python/python-pylint_0.15.2.bb b/recipes/python/python-pylint_0.15.2.bb
index dd8805abf0..9a8c7367c9 100644
--- a/recipes/python/python-pylint_0.15.2.bb
+++ b/recipes/python/python-pylint_0.15.2.bb
@@ -6,7 +6,7 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.logilab.org/857"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python-logilab-common"
+RDEPENDS_${PN} = "python-logilab-common"
 SRCNAME = "pylint"
 PR = "ml0"
 
diff --git a/recipes/python/python-pymp3_0.3.4.bb b/recipes/python/python-pymp3_0.3.4.bb
index 436285d810..978e2e28be 100644
--- a/recipes/python/python-pymp3_0.3.4.bb
+++ b/recipes/python/python-pymp3_0.3.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A Curses-based mp3 player. See http://damien.degois.info/PyMP3/"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
-RDEPENDS = "python-core python-curses python-pyid3lib python-mad python-ao"
+RDEPENDS_${PN} = "python-core python-curses python-pyid3lib python-mad python-ao"
 LICENSE = "GPL"
 PR = "r3"
 
diff --git a/recipes/python/python-pyopenssl_0.8.bb b/recipes/python/python-pyopenssl_0.8.bb
index 0fb39414de..3ec4e4d70d 100644
--- a/recipes/python/python-pyopenssl_0.8.bb
+++ b/recipes/python/python-pyopenssl_0.8.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-threading"
+RDEPENDS_${PN} = "python-threading"
 
 
 SRC_URI[md5sum] = "00377690f224d9e59c833fb0459603f4"
diff --git a/recipes/python/python-pyqt_4.4.3.bb b/recipes/python/python-pyqt_4.4.3.bb
index a0003aa95e..7c75dad4ee 100644
--- a/recipes/python/python-pyqt_4.4.3.bb
+++ b/recipes/python/python-pyqt_4.4.3.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "sip-native python-sip"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 SRCNAME = "pyqt"
 PR = "ml5"
 
diff --git a/recipes/python/python-pyrad_1.1.bb b/recipes/python/python-pyrad_1.1.bb
index 5736aa6c37..52025ba802 100644
--- a/recipes/python/python-pyrad_1.1.bb
+++ b/recipes/python/python-pyrad_1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python Radius Client and Server"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "BSD"
-RDEPENDS = "python-crypt"
+RDEPENDS_${PN} = "python-crypt"
 SRCNAME = "pyrad"
 PR = "r1"
 
diff --git a/recipes/python/python-pyraf_1.7.bb b/recipes/python/python-pyraf_1.7.bb
index cdb55ad91d..ce0aa8cc24 100644
--- a/recipes/python/python-pyraf_1.7.bb
+++ b/recipes/python/python-pyraf_1.7.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/pyraf-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-numarray"
+RDEPENDS_${PN} = "python-numarray"
 
 
 SRC_URI[md5sum] = "9a728aef7bebcd54abc103b00e2e1de6"
diff --git a/recipes/python/python-pyrex-native_0.9.8.5.bb b/recipes/python/python-pyrex-native_0.9.8.5.bb
index 62cb4ae4da..109b49ed15 100644
--- a/recipes/python/python-pyrex-native_0.9.8.5.bb
+++ b/recipes/python/python-pyrex-native_0.9.8.5.bb
@@ -1,7 +1,7 @@
 require python-pyrex_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-pyro_3.8.1.bb b/recipes/python/python-pyro_3.8.1.bb
index a36fe9b64f..89d47075a7 100644
--- a/recipes/python/python-pyro_3.8.1.bb
+++ b/recipes/python/python-pyro_3.8.1.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/Pyro-${PV}"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-crypt \
   python-io \
   python-lang \
diff --git a/recipes/python/python-pyserial_2.4.bb b/recipes/python/python-pyserial_2.4.bb
index 9c5ea881f9..1e16a2b5cf 100644
--- a/recipes/python/python-pyserial_2.4.bb
+++ b/recipes/python/python-pyserial_2.4.bb
@@ -12,7 +12,7 @@ inherit setuptools
 
 # FIXME might stop packaging serialwin32 and serialjava files
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-fcntl \
   python-io \
   python-stringold \
diff --git a/recipes/python/python-pysqlite2-native_2.4.0.bb b/recipes/python/python-pysqlite2-native_2.4.0.bb
index 0a7d667dca..7740628095 100644
--- a/recipes/python/python-pysqlite2-native_2.4.0.bb
+++ b/recipes/python/python-pysqlite2-native_2.4.0.bb
@@ -1,7 +1,7 @@
 require python-pysqlite2_${PV}.bb
 inherit native
 DEPENDS = "python-native sqlite3-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
     BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-pysqlite2_2.4.0.bb b/recipes/python/python-pysqlite2_2.4.0.bb
index 3ed8940bc8..37bb1fbdf1 100644
--- a/recipes/python/python-pysqlite2_2.4.0.bb
+++ b/recipes/python/python-pysqlite2_2.4.0.bb
@@ -17,7 +17,7 @@ do_install_append() {
     mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
  python-datetime \
  python-lang \
  python-crypt \
diff --git a/recipes/python/python-pyxml_0.8.4.bb b/recipes/python/python-pyxml_0.8.4.bb
index d8022ba84d..ba776d35dd 100644
--- a/recipes/python/python-pyxml_0.8.4.bb
+++ b/recipes/python/python-pyxml_0.8.4.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/PyXML-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-xml python-netclient"
+RDEPENDS_${PN} = "python-xml python-netclient"
 
 
 SRC_URI[md5sum] = "1f7655050cebbb664db976405fdba209"
diff --git a/recipes/python/python-scapy_2.0.0.9.bb b/recipes/python/python-scapy_2.0.0.9.bb
index 36256da0e8..67df8b1f14 100644
--- a/recipes/python/python-scapy_2.0.0.9.bb
+++ b/recipes/python/python-scapy_2.0.0.9.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-netclient \
   python-netserver \
 "
diff --git a/recipes/python/python-scons-native_1.2.0.bb b/recipes/python/python-scons-native_1.2.0.bb
index f94678244a..bdad3ee018 100644
--- a/recipes/python/python-scons-native_1.2.0.bb
+++ b/recipes/python/python-scons-native_1.2.0.bb
@@ -1,7 +1,7 @@
 require python-scons_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-setuptools_0.6c9.bb b/recipes/python/python-setuptools_0.6c9.bb
index df24384aa8..506a9368b9 100644
--- a/recipes/python/python-setuptools_0.6c9.bb
+++ b/recipes/python/python-setuptools_0.6c9.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
 PR = "ml0"
 
@@ -19,7 +18,7 @@ do_install_prepend() {
     install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-distutils \
   python-compression \
 "
diff --git a/recipes/python/python-simplejson_2.0.7.bb b/recipes/python/python-simplejson_2.0.7.bb
index d99d61aacd..f10ed7e95b 100644
--- a/recipes/python/python-simplejson_2.0.7.bb
+++ b/recipes/python/python-simplejson_2.0.7.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-core \
   python-re \
   python-io \
diff --git a/recipes/python/python-sip.inc b/recipes/python/python-sip.inc
index 1267d07f59..99af450e1b 100644
--- a/recipes/python/python-sip.inc
+++ b/recipes/python/python-sip.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 AUTHOR = "Phil Thompson"
 LICENSE = "GPL"
 DEPENDS = "python"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 
 SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
 
diff --git a/recipes/python/python-soappy_0.11.6.bb b/recipes/python/python-soappy_0.11.6.bb
index 93e9fd18ce..25ef6a7af7 100644
--- a/recipes/python/python-soappy_0.11.6.bb
+++ b/recipes/python/python-soappy_0.11.6.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 HOMEPAGE = "http://pywebsvcs.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
-RDEPENDS = "python-xml python-fpconst"
+RDEPENDS_${PN} = "python-xml python-fpconst"
 SRCNAME = "SOAPpy"
 PR = "r1"
 
diff --git a/recipes/python/python-sqlobject_0.10.4.bb b/recipes/python/python-sqlobject_0.10.4.bb
index 44d2516902..45de2b5370 100644
--- a/recipes/python/python-sqlobject_0.10.4.bb
+++ b/recipes/python/python-sqlobject_0.10.4.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-RDEPENDS = "python-formencode"
+RDEPENDS_${PN} = "python-formencode"
 
 SRC_URI[md5sum] = "20039279c5b799c49e6496b9fe71f03f"
 SRC_URI[sha256sum] = "8204bf5aeaca5b72e6bf3bd11db440346f3ed6d13b856166e3b84c4b3ec7152f"
diff --git a/recipes/python/python-traits_3.0.3.bb b/recipes/python/python-traits_3.0.3.bb
index 83ee814665..187f0da660 100644
--- a/recipes/python/python-traits_3.0.3.bb
+++ b/recipes/python/python-traits_3.0.3.bb
@@ -12,7 +12,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/Traits-${PV}"
 
-RDEPENDS = "python-netclient"
+RDEPENDS_${PN} = "python-netclient"
 
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/.debug"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/protocols/.debug"
diff --git a/recipes/python/python-twisted_2.5.0.bb b/recipes/python/python-twisted_2.5.0.bb
index d8f24587a2..63f0a437e1 100644
--- a/recipes/python/python-twisted_2.5.0.bb
+++ b/recipes/python/python-twisted_2.5.0.bb
@@ -29,7 +29,7 @@ PACKAGES += "\
   ${PN}-core \
 "
 
-RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_${PN} = "python-core python-zopeinterface"
 RDEPENDS_${PN} += "\
   ${PN}-bin \
   ${PN}-conch \
diff --git a/recipes/python/python-twisted_8.2.0.bb b/recipes/python/python-twisted_8.2.0.bb
index 0d84c8c60d..0925d1c016 100644
--- a/recipes/python/python-twisted_8.2.0.bb
+++ b/recipes/python/python-twisted_8.2.0.bb
@@ -30,7 +30,7 @@ PACKAGES += "\
   ${PN}-core \
 "
 
-RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_${PN} = "python-core python-zopeinterface"
 RDEPENDS_${PN} += "\
   ${PN}-bin \
   ${PN}-conch \
diff --git a/recipes/python/python-urlgrabber-native_3.1.0.bb b/recipes/python/python-urlgrabber-native_3.1.0.bb
index 5c2af551c0..d7468df113 100644
--- a/recipes/python/python-urlgrabber-native_3.1.0.bb
+++ b/recipes/python/python-urlgrabber-native_3.1.0.bb
@@ -1,7 +1,7 @@
 require python-urlgrabber_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 PR = "r1"
 
 do_stage() {
diff --git a/recipes/python/python-vobject_0.8.1c.bb b/recipes/python/python-vobject_0.8.1c.bb
index f86e7a34ab..afb41caf81 100644
--- a/recipes/python/python-vobject_0.8.1c.bb
+++ b/recipes/python/python-vobject_0.8.1c.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "Apache License V2.0" 
 HOMEPAGE = "http://vobject.skyhouseconsulting.com/" 
 SRCNAME = "vobject" 
-RDEPENDS = "python python-dateutil"
+RDEPENDS_${PN} = "python python-dateutil"
 PR = "r1"
 
 SRC_URI = "http://vobject.skyhouseconsulting.com/${SRCNAME}-${PV}.tar.gz" 
diff --git a/recipes/python/python-webpy_0.31.bb b/recipes/python/python-webpy_0.31.bb
index b3af54cc99..ce87b0d9ff 100644
--- a/recipes/python/python-webpy_0.31.bb
+++ b/recipes/python/python-webpy_0.31.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/webpy"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-netserver \
   python-netclient \
   python-pprint \
diff --git a/recipes/python/yum-metadata-parser-native_1.1.2.bb b/recipes/python/yum-metadata-parser-native_1.1.2.bb
index 15d26a18ce..5d913450d3 100644
--- a/recipes/python/yum-metadata-parser-native_1.1.2.bb
+++ b/recipes/python/yum-metadata-parser-native_1.1.2.bb
@@ -1,7 +1,7 @@
 require yum-metadata-parser_${PV}.bb
 inherit native
 DEPENDS = "python-native sqlite3-native glib-2.0-native libxml2-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 PR = "r1"
 
 do_stage() {