194 files changed, 572 insertions, 572 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb
index bb42298..56eb126 100644
--- a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb
@@ -17,7 +17,7 @@ DEPENDS += " \
         python-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-sphinx \
         "
 
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index 8908e20..85ab146 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -40,7 +40,7 @@ python () {
 }
 SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
     BARBICAN_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
 
@@ -67,24 +67,24 @@ do_install_append() {
 }
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system barbican"
-USERADD_PARAM_${PN}  = "--system --home /var/lib/barbican -g barbican \
+GROUPADD_PARAM:${PN} = "--system barbican"
+USERADD_PARAM:${PN}  = "--system --home /var/lib/barbican -g barbican \
                         --no-create-home --shell /bin/false barbican"
 
 PACKAGES += "${SRCNAME} \
              ${SRCNAME}-setup "
 
-FILES_${PN} = "${libdir}/* \
+FILES:${PN} = "${libdir}/* \
 "
-FILES_${SRCNAME} = "${sysconfdir}/${SRCNAME}/* \
+FILES:${SRCNAME} = "${sysconfdir}/${SRCNAME}/* \
                     ${sysconfdir}/init.d/barbican-api \
                     ${bindir} \
                     ${bindir}/* \
                     ${localstatedir}/* \
 "
 
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-pkg_postinst_${SRCNAME}-setup () {
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+pkg_postinst:${SRCNAME}-setup () {
     if [ -z "$D" ]; then
         chown -R barbican:barbican ${sysconfdir}/${SRCNAME}
         chown -R barbican:barbican ${localstatedir}/lib/barbican
@@ -101,13 +101,13 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${SRCNAME} = "${PN} \
+RDEPENDS:${SRCNAME} = "${PN} \
                        ${SRCNAME}-setup \
                        uwsgi \
                        python-falcon \
                        python-oslo.messaging"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pip \
         python-pbr \
         python-alembic \
@@ -131,8 +131,8 @@ RDEPENDS_${PN} += " \
         "
 
 INITSCRIPT_PACKAGES = "${SRCNAME}"
-INITSCRIPT_NAME_${SRCNAME} = "barbican-api"
-INITSCRIPT_PARAMS_${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME} = "barbican-api"
+INITSCRIPT_PARAMS:${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "barbican"
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 1f18d7b..2d6d708 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -47,13 +47,13 @@ python () {
     d.setVarFlags("USERCREATE_PARAM_%s-reseller" % d.getVar('SRCNAME',True), flags)
 }
 
-do_configure_append() {
+do_configure:append() {
     # We are using postgresql support, hence this requirement is not valid
     # removing it, to avoid on-target runtime issues
     sed -e "s:MySQL-python::g" -i ${S}/requirements.txt
 }
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
     CEILOMETER_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
 
@@ -107,7 +107,7 @@ do_install_append() {
     fi 
 }
 
-pkg_postinst_${SRCNAME}-setup () {
+pkg_postinst:${SRCNAME}-setup () {
     if [ -z "$D" ]; then
         # This is to make sure postgres is configured and running
         if ! pidof postmaster > /dev/null; then
@@ -131,44 +131,44 @@ PACKAGES += "${SRCNAME}-agent-notification"
 PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller"
 PACKAGES += " ${SRCNAME}-reseller"
 
-RDEPENDS_${SRCNAME}-tests += " bash"
+RDEPENDS:${SRCNAME}-tests += " bash"
 
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-ALLOW_EMPTY_${SRCNAME}-reseller = "1"
-ALLOW_EMPTY_${SRCNAME}-tests = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-reseller = "1"
+ALLOW_EMPTY:${SRCNAME}-tests = "1"
 
-FILES_${PN} = "${libdir}/*"
+FILES:${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/setup-test-env.sh"
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/setup-test-env.sh"
 
-FILES_${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \
+FILES:${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \
 "
 
-FILES_${SRCNAME}-api = "${bindir}/ceilometer-api \
+FILES:${SRCNAME}-api = "${bindir}/ceilometer-api \
                         ${sysconfdir}/init.d/ceilometer-api \
 "
 
-FILES_${SRCNAME}-collector = "${bindir}/ceilometer-collector \
+FILES:${SRCNAME}-collector = "${bindir}/ceilometer-collector \
                               ${bindir}/ceilometer-collector-udp \
                               ${sysconfdir}/init.d/ceilometer-collector \
 "
-FILES_${SRCNAME}-alarm-evaluator = "${bindir}/ceilometer-alarm-evaluator \
+FILES:${SRCNAME}-alarm-evaluator = "${bindir}/ceilometer-alarm-evaluator \
                                     ${sysconfdir}/init.d/ceilometer-alarm-evaluator \
 "
 
-FILES_${SRCNAME}-alarm-notifier = "${bindir}/ceilometer-alarm-notifier \
+FILES:${SRCNAME}-alarm-notifier = "${bindir}/ceilometer-alarm-notifier \
                                    ${sysconfdir}/init.d/ceilometer-alarm-notifier \
 "
 
-FILES_${SRCNAME}-agent-notification = "${bindir}/ceilometer-agent-notification \
+FILES:${SRCNAME}-agent-notification = "${bindir}/ceilometer-agent-notification \
                                        ${sysconfdir}/init.d/ceilometer-agent-notification \
 "
 
-FILES_${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \
+FILES:${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \
                             ${sysconfdir}/init.d/ceilometer-agent-compute \
 "
 
-FILES_${SRCNAME}-controller = "${bindir}/* \
+FILES:${SRCNAME}-controller = "${bindir}/* \
                                ${localstatedir}/* \
                                ${sysconfdir}/init.d/ceilometer-agent-central \
 "
@@ -183,7 +183,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-ply \
         python-jsonpath-rw \
         python-sqlalchemy \
@@ -258,30 +258,30 @@ RDEPENDS_${PN} += " \
         python-tooz \
         "
 
-RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification ${SRCNAME}-reseller \
+RDEPENDS:${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification ${SRCNAME}-reseller \
                                   postgresql postgresql-client python-psycopg2 tgt"
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller"
-RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller"
-RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient libvirt"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller"
-RDEPENDS_${SRCNAME}-reseller = "postgresql sudo ${SRCNAME}-controller"
+RDEPENDS:${SRCNAME}-api = "${SRCNAME}-controller"
+RDEPENDS:${SRCNAME}-collector = "${SRCNAME}-controller"
+RDEPENDS:${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient libvirt"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller"
+RDEPENDS:${SRCNAME}-reseller = "postgresql sudo ${SRCNAME}-controller"
 
 INITSCRIPT_PACKAGES =  "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller"
 INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification"
-INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api"
-INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-collector = "${SRCNAME}-collector"
-INITSCRIPT_PARAMS_${SRCNAME}-collector = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-compute = "${SRCNAME}-agent-compute"
-INITSCRIPT_PARAMS_${SRCNAME}-compute = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-controller = "${SRCNAME}-agent-central"
-INITSCRIPT_PARAMS_${SRCNAME}-controller = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier"
-INITSCRIPT_PARAMS_${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator"
-INITSCRIPT_PARAMS_${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-agent-notification = "${SRCNAME}-agent-notification"
-INITSCRIPT_PARAMS_${SRCNAME}-agent-notification = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api"
+INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-collector = "${SRCNAME}-collector"
+INITSCRIPT_PARAMS:${SRCNAME}-collector = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-compute = "${SRCNAME}-agent-compute"
+INITSCRIPT_PARAMS:${SRCNAME}-compute = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-controller = "${SRCNAME}-agent-central"
+INITSCRIPT_PARAMS:${SRCNAME}-controller = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier"
+INITSCRIPT_PARAMS:${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator"
+INITSCRIPT_PARAMS:${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-agent-notification = "${SRCNAME}-agent-notification"
+INITSCRIPT_PARAMS:${SRCNAME}-agent-notification = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "ceilometer"
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 8afe84d..e72d721 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -31,8 +31,8 @@ USER = "cinder"
 GROUP = "cinder"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system ${GROUP}"
-USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}"
+GROUPADD_PARAM:${PN} = "--system ${GROUP}"
+USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}"
 
 CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
 
@@ -44,7 +44,7 @@ CINDER_NFS_VOLUME_SERVERS ?= "${CINDER_NFS_VOLUME_SERVERS_DEFAULT}"
 CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT = "controller:/glusterfs_volumes"
 CINDER_GLUSTERFS_VOLUME_SERVERS ?= "${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}"
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
     CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
     
@@ -160,35 +160,35 @@ do_install_append() {
 #}
 
 PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-ALLOW_EMPTY_${SRCNAME}-backup = "1"
-ALLOW_EMPTY_${SRCNAME}-scheduler = "1"
-ALLOW_EMPTY_${SRCNAME}-volume = "1"
-ALLOW_EMPTY_${SRCNAME}-api = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-backup = "1"
+ALLOW_EMPTY:${SRCNAME}-scheduler = "1"
+ALLOW_EMPTY:${SRCNAME}-volume = "1"
+ALLOW_EMPTY:${SRCNAME}-api = "1"
 
-RDEPENDS_${SRCNAME}-tests += " bash python"
+RDEPENDS:${SRCNAME}-tests += " bash python"
 
-FILES_${PN} = "${libdir}/* /etc/tgt"
+FILES:${PN} = "${libdir}/* /etc/tgt"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools"
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools"
 
-FILES_${SRCNAME}-api = " \
+FILES:${SRCNAME}-api = " \
     ${bindir}/cinder-api \
 "
 
-FILES_${SRCNAME}-volume = " \
+FILES:${SRCNAME}-volume = " \
     ${bindir}/cinder-volume \
 "
 
-FILES_${SRCNAME}-scheduler = " \
+FILES:${SRCNAME}-scheduler = " \
     ${bindir}/cinder-scheduler \
 "
 
-FILES_${SRCNAME}-backup = " \
+FILES:${SRCNAME}-backup = " \
     ${bindir}/cinder-backup \
 "
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     ${localstatedir}/* \
     ${sysconfdir}/${SRCNAME}/drivers/* \
@@ -204,7 +204,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         lvm2 \
         python-pbr \
         python-babel \
@@ -267,17 +267,17 @@ RDEPENDS_${PN} += " \
         python-cryptography \
         "
 
-RDEPENDS_${SRCNAME} = " \
+RDEPENDS:${SRCNAME} = " \
     ${PN} \
     postgresql \
     postgresql-client \
     python-psycopg2 \
     tgt"
 
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-volume = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash"
+RDEPENDS:${SRCNAME}-api = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-volume = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-scheduler = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash"
 
 SYSTEMD_PACKAGES = " \
     ${SRCNAME}-setup \
@@ -287,17 +287,17 @@ SYSTEMD_PACKAGES = " \
     ${SRCNAME}-backup \
 "
 
-SYSTEMD_SERVICE_${SRCNAME}-setup = "cinder-init.service"
-SYSTEMD_SERVICE_${SRCNAME}-api = "cinder-api.service"
-SYSTEMD_SERVICE_${SRCNAME}-volume = "cinder-volume.service"
-SYSTEMD_SERVICE_${SRCNAME}-scheduler = "cinder-scheduler.service"
-SYSTEMD_SERVICE_${SRCNAME}-backup = "cinder-backup.service"
+SYSTEMD_SERVICE:${SRCNAME}-setup = "cinder-init.service"
+SYSTEMD_SERVICE:${SRCNAME}-api = "cinder-api.service"
+SYSTEMD_SERVICE:${SRCNAME}-volume = "cinder-volume.service"
+SYSTEMD_SERVICE:${SRCNAME}-scheduler = "cinder-scheduler.service"
+SYSTEMD_SERVICE:${SRCNAME}-backup = "cinder-backup.service"
 
 # Disable until they are configured (via -setup)
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-volume = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-backup = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-api = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-volume = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-scheduler = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-backup = "disable"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "cinder"
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index bacb25f..e8d6ffc 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -28,7 +28,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-prettytable \
         python-keystoneauth1 \
@@ -43,13 +43,13 @@ RDEPENDS_${PN} += " \
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
 
-do_install_append() {
+do_install:append() {
         install -d ${D}/${sysconfdir}/bash_completion.d
         install -m 664 ${S}/tools/cinder.bash_completion ${D}/${sysconfdir}/bash_completion.d
 }
 
 PACKAGES =+ "${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
 
 MONITOR_CHECKS_${PN} += "\
         cinder-api-check.sh \
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index f692963..a9537ce 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -25,8 +25,8 @@ USER = "glance"
 GROUP = "glance"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system ${GROUP}"
-USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}"
+GROUPADD_PARAM:${PN} = "--system ${GROUP}"
+USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}"
 
 GLANCE_DEFAULT_STORE ?= "file"
 GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
@@ -56,13 +56,13 @@ python () {
 }
 SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
 
-do_install_prepend() {
+do_install:prepend() {
     sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py
     sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py
     sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/utils.py
 }
 
-do_install_append() {
+do_install:append() {
     SRC_SYSCONFDIR=${S}${sysconfdir}
     GLANCE_CONF_DIR=${D}${sysconfdir}/glance
 
@@ -140,26 +140,26 @@ do_install_append() {
 
 PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${libdir}/* \
     ${datadir}/etc/${SRCNAME}* \
     "
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     ${localstatedir}/* \
     "
 
-FILES_${SRCNAME}-setup = " \
+FILES:${SRCNAME}-setup = " \
     ${systemd_unitdir}/system/glance-init.service \
     "
 
-FILES_${SRCNAME}-api = " \
+FILES:${SRCNAME}-api = " \
     ${bindir}/glance-api \
     ${systemd_unitdir}/system/glance-api.service \
     "
 
-FILES_${SRCNAME}-registry = "\
+FILES:${SRCNAME}-registry = "\
     ${bindir}/glance-registry \
     ${systemd_unitdir}/system/glance-registry.service \
     "
@@ -174,7 +174,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         coreutils \
         python-pbr \
         python-sqlalchemy \
@@ -218,22 +218,22 @@ RDEPENDS_${PN} += " \
         python-monotonic \
         "
 
-RDEPENDS_${SRCNAME} = " \
+RDEPENDS:${SRCNAME} = " \
         ${PN} \
         postgresql \
         postgresql-client \
         python-psycopg2 \
         "
 
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-registry = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}"
-RDEPENDS_${SRCNAME}-tests = "python-psutil qpid-python bash"
+RDEPENDS:${SRCNAME}-api = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-registry = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}"
+RDEPENDS:${SRCNAME}-tests = "python-psutil qpid-python bash"
 
 SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup"
-SYSTEMD_SERVICE_${SRCNAME}-api = "glance-api.service"
-SYSTEMD_SERVICE_${SRCNAME}-registry = "glance-registry.service"
-SYSTEMD_SERVICE_${SRCNAME}-setup = "glance-init.service"
+SYSTEMD_SERVICE:${SRCNAME}-api = "glance-api.service"
+SYSTEMD_SERVICE:${SRCNAME}-registry = "glance-registry.service"
+SYSTEMD_SERVICE:${SRCNAME}-setup = "glance-init.service"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "glance"
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index a41405f..acfc6e7 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -19,14 +19,14 @@ DEPENDS += " \
 
 inherit setuptools3 monitor rmargparse
 
-FILES_${PN} += "${datadir}/${SRCNAME}"
+FILES:${PN} += "${datadir}/${SRCNAME}"
 
 # Satisfy setup.py 'setup_requires'
 DEPENDS += " \
     python-pbr-native \
     "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    gmp \
    bash \
    python-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
index 3756dda..e769bbd 100644
--- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
@@ -26,7 +26,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    python-enum34 \
    python-eventlet \
    python-iso8601 \
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index a3102ff..0f2f194 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -57,7 +57,7 @@ python () {
     d.setVarFlags("SERVICECREATE_PARAM_%s-cfn" % d.getVar('SRCNAME',True), flags)
 }
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
     HEAT_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
 
@@ -106,7 +106,7 @@ do_install_append() {
     fi
 }
 
-pkg_postinst_${SRCNAME}-setup () {
+pkg_postinst:${SRCNAME}-setup () {
     if [ -z "$D" ]; then
         # This is to make sure postgres is configured and running
         if ! pidof postmaster > /dev/null; then
@@ -127,30 +127,30 @@ PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}-
 PACKAGES += "${SRCNAME}-setup"
 PACKAGES += "${SRCNAME}-cfn"
 
-RDEPENDS_${SRCNAME}-tests += " bash"
+RDEPENDS:${SRCNAME}-tests += " bash"
 
-ALLOW_EMPTY_${SRCNAME}-tests = "1"
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-ALLOW_EMPTY_${SRCNAME}-templates = "1"
-ALLOW_EMPTY_${SRCNAME}-cfn = "1"
+ALLOW_EMPTY:${SRCNAME}-tests = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-templates = "1"
+ALLOW_EMPTY:${SRCNAME}-cfn = "1"
 
-FILES_${PN} = "${libdir}/*"
+FILES:${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
 
-FILES_${SRCNAME}-templates = "${sysconfdir}/${SRCNAME}/templates/*"
+FILES:${SRCNAME}-templates = "${sysconfdir}/${SRCNAME}/templates/*"
 
-FILES_${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \
+FILES:${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \
 "
 
-FILES_${SRCNAME}-api = "${bindir}/heat-api \
+FILES:${SRCNAME}-api = "${bindir}/heat-api \
                         ${sysconfdir}/init.d/heat-api \
 "
-FILES_${SRCNAME}-api-cfn = "${bindir}/heat-api-cfn \
+FILES:${SRCNAME}-api-cfn = "${bindir}/heat-api-cfn \
                            ${sysconfdir}/init.d/heat-api-cfn \
 "
 
-FILES_${SRCNAME}-engine = "${bindir}/heat-engine \
+FILES:${SRCNAME}-engine = "${bindir}/heat-engine \
                            ${bindir}/* \
                            ${sysconfdir}/init.d/heat-engine \
 "
@@ -165,7 +165,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-heatclient \
         python-sqlalchemy \
         python-amqplib \
@@ -246,20 +246,20 @@ RDEPENDS_${PN} += " \
         bash \
         "
 
-RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn bash"
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}-engine"
-RDEPENDS_${SRCNAME}-api-cfn = "${SRCNAME}-engine"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine"
-RDEPENDS_${SRCNAME}-templates = "postgresql sudo"
-RDEPENDS_${SRCNAME}-cfn = "postgresql sudo"
+RDEPENDS:${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn bash"
+RDEPENDS:${SRCNAME}-api = "${SRCNAME}-engine"
+RDEPENDS:${SRCNAME}-api-cfn = "${SRCNAME}-engine"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine"
+RDEPENDS:${SRCNAME}-templates = "postgresql sudo"
+RDEPENDS:${SRCNAME}-cfn = "postgresql sudo"
 
 INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine"
-INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api"
-INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn"
-INITSCRIPT_PARAMS_${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-engine = "${SRCNAME}-engine"
-INITSCRIPT_PARAMS_${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api"
+INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn"
+INITSCRIPT_PARAMS:${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-engine = "${SRCNAME}-engine"
+INITSCRIPT_PARAMS:${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "heat"
diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
index e0927f3..db6fd60 100644
--- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} +="python-cliff \
+RDEPENDS:${PN} +="python-cliff \
         python-httplib2 \
         python-iso8601 \
         python-prettytable \
@@ -39,15 +39,15 @@ inherit setuptools3
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
 
-do_install_append() {
+do_install:append() {
         install -d ${D}/${sysconfdir}/bash_completion.d
         install -m 664 ${S}/tools/heat.bash_completion ${D}/${sysconfdir}/bash_completion.d
 }
 
 PACKAGES =+ "${SRCNAME}-tests ${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
-ALLOW_EMPTY_${SRCNAME}-tests = "1"
+FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+ALLOW_EMPTY:${SRCNAME}-tests = "1"
 
-RDEPENDS_${SRCNAME}-tests += "python-testscenarios \
+RDEPENDS:${SRCNAME}-tests += "python-testscenarios \
         python-mox3 \
         "
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 26afe40..9e36656 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-babel \
         python-django \
@@ -96,13 +96,13 @@ USER = "horizon"
 GROUP = "horizon"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system ${GROUP}"
-USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/openstack-dashboard -s /bin/false -g ${GROUP} ${USER}"
+GROUPADD_PARAM:${PN} = "--system ${GROUP}"
+USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/openstack-dashboard -s /bin/false -g ${GROUP} ${USER}"
 
 # no longer required. kept as reference.
 # do_install[dirs] += "${D}/usr/share/bin"
 
-do_install_append() {
+do_install:append() {
     SYSCONF_DIR=${D}${sysconfdir}
     DASHBOARD_CONF_DIR=${SYSCONF_DIR}/openstack-dashboard
     DASHBOARD_SHARE_DIR=${D}${datadir}/openstack-dashboard
@@ -163,7 +163,7 @@ do_install_append() {
     ln -fs openstack_dashboard/static ${DASHBOARD_SHARE_DIR}/static
 }
 
-pkg_postinst_${SRCNAME} () {
+pkg_postinst:${SRCNAME} () {
     if [ -n "$D" ]; then
         exit 1
     else
@@ -173,39 +173,39 @@ pkg_postinst_${SRCNAME} () {
 }
 
 PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache ${SRCNAME}-standalone"
-ALLOW_EMPTY_${SRCNAME}-standalone = "1"
+ALLOW_EMPTY:${SRCNAME}-standalone = "1"
 
-RDEPENDS_${SRCNAME}-tests += " bash"
+RDEPENDS:${SRCNAME}-tests += " bash"
 
-FILES_${PN} = "${libdir}/*"
+FILES:${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/openstack-dashboard/run_tests.sh"
+FILES:${SRCNAME}-tests = "${sysconfdir}/openstack-dashboard/run_tests.sh"
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${datadir}/* \
     "
 
-FILES_${SRCNAME}-standalone = "${sysconfdir}/init.d/horizon"
+FILES:${SRCNAME}-standalone = "${sysconfdir}/init.d/horizon"
 
-FILES_${SRCNAME}-apache = " \
+FILES:${SRCNAME}-apache = " \
     ${sysconfdir}/apache2 \
     ${sysconfdir}/openstack-dashboard/ \
     ${datadir}/openstack-dashboard/ \
     "
 
 RDEP_ARCH_VAR = ""
-RDEP_ARCH_VAR_arm = "nodejs"
+RDEP_ARCH_VAR:arm = "nodejs"
 RDEP_ARCH_VAR_i686 = "nodejs"
-RDEP_ARCH_VAR_x86-64 = "nodejs"
+RDEP_ARCH_VAR:x86-64 = "nodejs"
 RDEP_ARCH_VAR_ia32 = "nodejs"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${RDEP_ARCH_VAR} \
     "
 
-RDEPENDS_${SRCNAME} = "${PN}"
+RDEPENDS:${SRCNAME} = "${PN}"
 
-RDEPENDS_${SRCNAME}-apache = "\
+RDEPENDS:${SRCNAME}-apache = "\
     apache2 \
     mod-wsgi \
     python-lesscpy \
diff --git a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
index e595180..cd86952 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
@@ -14,9 +14,9 @@ S = "${WORKDIR}/git"
 
 inherit python3-dir
 
-do_install_append() {
+do_install:append() {
     install -D -m 0644 hybrid_assignment.py ${D}/${PYTHON_SITEPACKAGES_DIR}/keystone/assignment/backends/hybrid_assignment.py
     install -D -m 0644 hybrid_identity.py ${D}/${PYTHON_SITEPACKAGES_DIR}/keystone/identity/backends/hybrid_identity.py
 }
 
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index a8cc944..e533fcd 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -32,7 +32,7 @@ SERVICE_TOKEN = "password"
 TOKEN_FORMAT ?= "PKI"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system -m -s /bin/false keystone"
+USERADD_PARAM:${PN} = "--system -m -s /bin/false keystone"
 
 LDAP_DN ?= "dc=my-domain,dc=com"
 
@@ -65,7 +65,7 @@ python () {
     d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
 }
 
-do_install_append() {
+do_install:append() {
 
     KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone
     KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone
@@ -191,7 +191,7 @@ role_tree_dn = ou=Roles,${LDAP_DN} \
 # this token flush cronjob to run every 2 days
 KEYSTONE_TOKEN_FLUSH_TIME ??= "0 0 */2 * *"
 
-pkg_postinst_${SRCNAME}-cronjobs () {
+pkg_postinst:${SRCNAME}-cronjobs () {
     if [ -z "$D" ]; then
         # By default keystone expired tokens are not automatic removed out of the
         # database.  So we create a cronjob for cleaning these expired tokens.
@@ -202,20 +202,20 @@ pkg_postinst_${SRCNAME}-cronjobs () {
 PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs"
 
 SYSTEMD_PACKAGES += "${SRCNAME}-setup"
-SYSTEMD_SERVICE_${SRCNAME}-setup = "keystone-init.service"
+SYSTEMD_SERVICE:${SRCNAME}-setup = "keystone-init.service"
 
-FILES_${SRCNAME}-setup = " \
+FILES:${SRCNAME}-setup = " \
     ${systemd_unitdir}/system \
     "
 
-ALLOW_EMPTY_${SRCNAME}-cronjobs = "1"
+ALLOW_EMPTY:${SRCNAME}-cronjobs = "1"
 
-FILES_${PN} = "${libdir}/* \
+FILES:${PN} = "${libdir}/* \
     "
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     ${localstatedir}/* \
     ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \
@@ -232,7 +232,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-babel \
         python-pbr \
         python-webob \
@@ -271,7 +271,7 @@ RDEPENDS_${PN} += " \
         python-pytz \
         "
 
-RDEPENDS_${SRCNAME}-tests += " bash"
+RDEPENDS:${SRCNAME}-tests += " bash"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}"
 PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend"
@@ -279,7 +279,7 @@ PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend"
 # TODO:
 #    if DISTRO_FEATURE contains "tempest" then add *-tests to the main RDEPENDS
 
-RDEPENDS_${SRCNAME} = " \
+RDEPENDS:${SRCNAME} = " \
     ${PN} \
     postgresql \
     postgresql-client \
@@ -287,8 +287,8 @@ RDEPENDS_${SRCNAME} = " \
     apache2 \
     "
 
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
-RDEPENDS_${SRCNAME}-cronjobs = "cronie ${SRCNAME}"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
+RDEPENDS:${SRCNAME}-cronjobs = "cronie ${SRCNAME}"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "keystone"
diff --git a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
index d97cdc0..343942f 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
@@ -23,7 +23,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-sqlalchemy \
         python-debtcollector \
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 315cb45..5973834 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -38,8 +38,8 @@ USER = "neutron"
 GROUP = "neutron"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system ${GROUP}"
-USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}"
+GROUPADD_PARAM:${PN} = "--system ${GROUP}"
+USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}"
 
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
 KEYSTONE_HOST="${CONTROLLER_IP}"
@@ -60,7 +60,7 @@ python () {
     d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
 }
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/
     NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron
 
@@ -214,7 +214,7 @@ do_install_append() {
     install -m 600 ${S}/etc/neutron/rootwrap.d/* ${NEUTRON_CONF_DIR}/rootwrap.d/
 }
 
-pkg_postinst_${SRCNAME}-setup () {
+pkg_postinst:${SRCNAME}-setup () {
     if [ -z "$D" ]; then
         # This is to make sure postgres is configured and running
         if ! pidof postmaster > /dev/null; then
@@ -229,15 +229,15 @@ pkg_postinst_${SRCNAME}-setup () {
     fi
 }
 
-pkg_postinst_${SRCNAME}-plugin-openvswitch-setup () {
+pkg_postinst:${SRCNAME}-plugin-openvswitch-setup () {
     if [ -z "$D" ]; then
         /etc/init.d/openvswitch-switch start
         ovs-vsctl --no-wait -- --may-exist add-br br-int
     fi
 }
 
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-ALLOW_EMPTY_${SRCNAME}-plugin-openvswitch-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-plugin-openvswitch-setup = "1"
 
 PACKAGES += " \
      ${SRCNAME}-tests \
@@ -257,13 +257,13 @@ PACKAGES += " \
      ${SRCNAME}-plugin-openvswitch-setup \
      "
 
-FILES_${PN} = "${libdir}/*"
+FILES:${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
-RDEPENDS_${SRCNAME}-tests += " bash"
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
+RDEPENDS:${SRCNAME}-tests += " bash"
 
 
-FILES_${SRCNAME} = " \
+FILES:${SRCNAME} = " \
     ${bindir}/neutron-db-manage \
     ${bindir}/neutron-rootwrap \
     ${bindir}/neutron-debug \
@@ -278,53 +278,53 @@ FILES_${SRCNAME} = " \
     ${localstatedir}/* \    
     "
 
-FILES_${SRCNAME}-server = " \
+FILES:${SRCNAME}-server = " \
     ${bindir}/neutron-server \
     ${sysconfdir}/neutron/plugin.ini \
     "
 
-FILES_${SRCNAME}-plugin-ml2 = " \
+FILES:${SRCNAME}-plugin-ml2 = " \
     ${sysconfdir}/${SRCNAME}/plugins/ml2/* \
     "
 
-FILES_${SRCNAME}-plugin-openvswitch = " \
+FILES:${SRCNAME}-plugin-openvswitch = " \
     ${bindir}/neutron-openvswitch-agent \
     ${sysconfdir}/init.d/neutron-openvswitch-agent \
     "
 
-FILES_${SRCNAME}-dhcp-agent = " \
+FILES:${SRCNAME}-dhcp-agent = " \
     ${bindir}/neutron-dhcp-agent \
     ${bindir}/neutron-dhcp-agent-dnsmasq-lease-update \
     ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \
     ${sysconfdir}/cron.d/neutron-dhcp-agent-netns-cleanup \
     "
 
-FILES_${SRCNAME}-linuxbridge-agent = " \
+FILES:${SRCNAME}-linuxbridge-agent = " \
     ${bindir}/neutron-linuxbridge-agent \
     ${sysconfdir}/${SRCNAME}/plugins/ml2/linuxbridge_agent.ini \
     "
 
-FILES_${SRCNAME}-l3-agent = " \
+FILES:${SRCNAME}-l3-agent = " \
     ${bindir}/neutron-l3-agent \
     ${sysconfdir}/${SRCNAME}/l3_agent.ini \
     "
 
-FILES_${SRCNAME}-metadata-agent = " \
+FILES:${SRCNAME}-metadata-agent = " \
     ${bindir}/neutron-metadata-agent \
     ${bindir}/neutron-ns-metadata-proxy \
     ${sysconfdir}/${SRCNAME}/metadata_agent.ini \
     "
 
-FILES_${SRCNAME}-metering-agent = " \
+FILES:${SRCNAME}-metering-agent = " \
     ${bindir}/neutron-metering-agent \
     ${sysconfdir}/${SRCNAME}/metering_agent.ini \
     "
 
-FILES_${SRCNAME}-extra-agents = "${bindir}/*"
+FILES:${SRCNAME}-extra-agents = "${bindir}/*"
 
-FILES_${SRCNAME}-doc = "${datadir}/*"
+FILES:${SRCNAME}-doc = "${datadir}/*"
 
-FILES_${SRCNAME}-setup = " \
+FILES:${SRCNAME}-setup = " \
     ${sysconfdir}/neutron/neutron-init \
     "
 
@@ -338,7 +338,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-paste \
         python-pastedeploy \
@@ -389,20 +389,20 @@ RDEPENDS_${PN} += " \
         python-os-xenapi \
         "
 
-RDEPENDS_${SRCNAME} = "${PN} \
+RDEPENDS:${SRCNAME} = "${PN} \
         postgresql postgresql-client python-psycopg2"
 
-RDEPENDS_${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent"
-RDEPENDS_${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils"
-RDEPENDS_${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch "
-RDEPENDS_${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config"
-RDEPENDS_${SRCNAME}-linuxbridge-agent = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils"
-RDEPENDS_${SRCNAME}-metadata-agent = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-plugin-ml2 = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo bash"
+RDEPENDS:${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent"
+RDEPENDS:${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils"
+RDEPENDS:${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch "
+RDEPENDS:${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config"
+RDEPENDS:${SRCNAME}-linuxbridge-agent = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils"
+RDEPENDS:${SRCNAME}-metadata-agent = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-plugin-ml2 = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo bash"
 
-RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch"
+RRECOMMENDS:${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch"
 
 #INITSCRIPT_PACKAGES = "${SRCNAME}-plugin-openvswitch ${SRCNAME}-l3-agent"
 #INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent"
@@ -417,17 +417,17 @@ SYSTEMD_PACKAGES = " \
     ${SRCNAME}-linuxbridge-agent \
     ${SRCNAME}-metadata-agent \
     "
-SYSTEMD_SERVICE_${SRCNAME}-server = "neutron-server.service"
-SYSTEMD_SERVICE_${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service"
-SYSTEMD_SERVICE_${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service"
-SYSTEMD_SERVICE_${SRCNAME}-metadata-agent = "neutron-metadata-agent.service"
-SYSTEMD_SERVICE_${SRCNAME}-setup = "neutron-init.service"
+SYSTEMD_SERVICE:${SRCNAME}-server = "neutron-server.service"
+SYSTEMD_SERVICE:${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service"
+SYSTEMD_SERVICE:${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service"
+SYSTEMD_SERVICE:${SRCNAME}-metadata-agent = "neutron-metadata-agent.service"
+SYSTEMD_SERVICE:${SRCNAME}-setup = "neutron-init.service"
 
 # Disable unconfigured services
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-server = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-dhcp-agent = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-linuxbridge-agent = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-metadata-agent = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-server = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-dhcp-agent = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-linuxbridge-agent = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-metadata-agent = "disable"
 
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index f519bf7..090f963 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-cliff \
         python-debtcollector \
@@ -48,13 +48,13 @@ inherit setuptools3 monitor rmargparse
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
 
-do_install_append() {
+do_install:append() {
         install -d ${D}/${sysconfdir}/bash_completion.d
         install -m 664 ${S}/tools/neutron.bash_completion ${D}/${sysconfdir}/bash_completion.d
 }
 
 PACKAGES =+ "${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
 
 MONITOR_CHECKS_${PN} += "\
         neutron-api-check.sh \
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 8c643bd..77e7b82 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -11,7 +11,7 @@ DEPENDS = " \
 
 SRCNAME = "nova"
 
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}"
 
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \
            file://neutron-api-set-default-binding-vnic_type.patch \
@@ -46,8 +46,8 @@ USER = "nova"
 GROUP = "nova"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system ${GROUP}"
-USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g ${GROUP} ${USER}"
+GROUPADD_PARAM:${PN} = "--system ${GROUP}"
+USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g ${GROUP} ${USER}"
 
 # Need to create the user?
 PLACEMENT_USER = "placement"
@@ -82,7 +82,7 @@ python () {
     d.setVarFlags("SERVICECREATE_PARAM_%s-ec2" % d.getVar('SRCNAME',True), flags)
 }
 
-do_install_append() {
+do_install:append() {
     if [ ! -f "${WORKDIR}/nova.conf" ]; then
         return
     fi
@@ -227,37 +227,37 @@ PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion"
 
 PACKAGES =+ "${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
 
 
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-ALLOW_EMPTY_${SRCNAME}-ec2 = "1"
-ALLOW_EMPTY_${SRCNAME}-api = "1"
-ALLOW_EMPTY_${SRCNAME}-compute = "1"
-ALLOW_EMPTY_${SRCNAME}-controller = "1"
-ALLOW_EMPTY_${SRCNAME}-console = "1"
-ALLOW_EMPTY_${SRCNAME}-conductor = "1"
-ALLOW_EMPTY_${SRCNAME}-network = "1"
-ALLOW_EMPTY_${SRCNAME}-novncproxy = "1"
-ALLOW_EMPTY_${SRCNAME}-scheduler = "1"
-ALLOW_EMPTY_${SRCNAME}-spicehtml5proxy = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-ec2 = "1"
+ALLOW_EMPTY:${SRCNAME}-api = "1"
+ALLOW_EMPTY:${SRCNAME}-compute = "1"
+ALLOW_EMPTY:${SRCNAME}-controller = "1"
+ALLOW_EMPTY:${SRCNAME}-console = "1"
+ALLOW_EMPTY:${SRCNAME}-conductor = "1"
+ALLOW_EMPTY:${SRCNAME}-network = "1"
+ALLOW_EMPTY:${SRCNAME}-novncproxy = "1"
+ALLOW_EMPTY:${SRCNAME}-scheduler = "1"
+ALLOW_EMPTY:${SRCNAME}-spicehtml5proxy = "1"
 
 
 
-FILES_${PN} = "${libdir}/*"
+FILES:${PN} = "${libdir}/*"
 
-# MAA FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
-FILES_${SRCNAME}-tests = ""
+# MAA FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
+FILES:${SRCNAME}-tests = ""
 
-FILES_${SRCNAME}-common = "${bindir}/nova-manage \
+FILES:${SRCNAME}-common = "${bindir}/nova-manage \
                            ${bindir}/nova-rootwrap \
                            ${sysconfdir}/${SRCNAME}/* \
                            ${sysconfdir}/sudoers.d"
 
-FILES_${SRCNAME}-compute = "${bindir}/nova-compute \
+FILES:${SRCNAME}-compute = "${bindir}/nova-compute \
                             ${sysconfdir}/init.d/nova-compute"
 
-FILES_${SRCNAME}-controller = "${bindir}/* \
+FILES:${SRCNAME}-controller = "${bindir}/* \
                                ${sysconfdir}/init.d/nova-all "
 
 DEPENDS += " \
@@ -270,7 +270,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
                    libvirt \
                    python-pbr \
                    python-sqlalchemy \
@@ -333,10 +333,10 @@ RDEPENDS_${PN} += " \
                    python-pypowervm \
    "
 
-RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
+RDEPENDS:${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
                               iptables curl dnsmasq sudo procps"
 
-RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
+RDEPENDS:${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
                                   ${SRCNAME}-ec2 \
                                   ${SRCNAME}-console \
                                   ${SRCNAME}-novncproxy \
@@ -347,12 +347,12 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
                                   ${SRCNAME}-api \
                                   postgresql postgresql-client python-psycopg2"
 
-RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \
+RDEPENDS:${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \
                                qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common"
-RDEPENDS_${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common"
+RDEPENDS:${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common"
 
-RDEPENDS_${SRCNAME}-tests = " \
+RDEPENDS:${SRCNAME}-tests = " \
                             python-coverage \
                             bash \
                             "
@@ -370,22 +370,22 @@ SYSTEMD_PACKAGES = " \
     ${SRCNAME}-api \
     "
 
-SYSTEMD_SERVICE_${SRCNAME}-setup = "nova-init.service"
-SYSTEMD_SERVICE_${SRCNAME}-compute = "nova-compute.service"
-SYSTEMD_SERVICE_${SRCNAME}-console = "nova-console.service nova-consoleauth.service nova-xvpvncproxy.service"
-SYSTEMD_SERVICE_${SRCNAME}-novncproxy = "nova-novncproxy.service"
-SYSTEMD_SERVICE_${SRCNAME}-spicehtml5proxy = "nova-spicehtml5proxy.service"
-SYSTEMD_SERVICE_${SRCNAME}-network = "nova-network.service"
-SYSTEMD_SERVICE_${SRCNAME}-scheduler = "nova-scheduler.service"
-SYSTEMD_SERVICE_${SRCNAME}-conductor = "nova-conductor.service"
-SYSTEMD_SERVICE_${SRCNAME}-api = "nova-api.service"
+SYSTEMD_SERVICE:${SRCNAME}-setup = "nova-init.service"
+SYSTEMD_SERVICE:${SRCNAME}-compute = "nova-compute.service"
+SYSTEMD_SERVICE:${SRCNAME}-console = "nova-console.service nova-consoleauth.service nova-xvpvncproxy.service"
+SYSTEMD_SERVICE:${SRCNAME}-novncproxy = "nova-novncproxy.service"
+SYSTEMD_SERVICE:${SRCNAME}-spicehtml5proxy = "nova-spicehtml5proxy.service"
+SYSTEMD_SERVICE:${SRCNAME}-network = "nova-network.service"
+SYSTEMD_SERVICE:${SRCNAME}-scheduler = "nova-scheduler.service"
+SYSTEMD_SERVICE:${SRCNAME}-conductor = "nova-conductor.service"
+SYSTEMD_SERVICE:${SRCNAME}-api = "nova-api.service"
 
 # Disable services on first boot to avoid having them run when not configured
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-consoleauth = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-conductor = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-novncproxy = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-api = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-consoleauth = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-scheduler = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-conductor = "disable"
+SYSTEMD_AUTO_ENABLE:${SRCNAME}-novncproxy = "disable"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "nova-api nova-conductor nova-console nova-scheduler"
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index f85ae4d..9f0ac5c 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -25,7 +25,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-keystoneauth1 \
         python-iso8601 \
@@ -42,7 +42,7 @@ RDEPENDS_${PN} += " \
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
 
-do_install_append() {
+do_install:append() {
         install -d ${D}/${sysconfdir}/bash_completion.d
         install -m 664 ${S}/tools/nova.bash_completion ${D}/${sysconfdir}/bash_completion.d
 
@@ -53,7 +53,7 @@ do_install_append() {
 }
 
 PACKAGES =+ "${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
 
 MONITOR_CHECKS_${PN} += "\
         nova-api-check.sh \
diff --git a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb
index 3835138..e989567 100644
--- a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb
+++ b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d98
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += "python-prettytable \
+RDEPENDS:${PN} += "python-prettytable \
             python-cmd2 \
             python-pyparsing \
             python-mccabe \
@@ -17,7 +17,7 @@ RDEPENDS_${PN} += "python-prettytable \
             python-pyflakes"
 
 
-do_install_append() {
+do_install:append() {
         perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO")
         for f in $perm_files; do
                 chmod 644 "${f}"
diff --git a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
index a5be175..b6741af 100644
--- a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
@@ -15,11 +15,11 @@ DEPENDS += " \
         python-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
 
-do_install_append() {
+do_install:append() {
         perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt" -o -name "requires.txt"`
         perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO")
         for f in $perm_files; do
diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
index 4ad6593..b90f496 100644
--- a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
@@ -23,7 +23,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-six \
         python-babel \
diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config.inc b/meta-openstack/recipes-devtools/python/python-os-client-config.inc
index d549ea6..356845a 100644
--- a/meta-openstack/recipes-devtools/python/python-os-client-config.inc
+++ b/meta-openstack/recipes-devtools/python/python-os-client-config.inc
@@ -20,7 +20,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-pyyaml \
         ${PYTHON_PN}-appdirs \
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb
index ef86418..063a2b9 100644
--- a/meta-openstack/recipes-devtools/python/python-rally_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3 update-rc.d hosts identity default_configs
 
-do_install_append() {
+do_install:append() {
     RALLY_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
     RALLY_PYTHON_SITEPACKAGES_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}
 
@@ -62,7 +62,7 @@ do_install_append() {
     cp -r ${S}/tools ${RALLY_CONF_DIR}
 }
 
-pkg_postinst_${SRCNAME}-setup () {
+pkg_postinst:${SRCNAME}-setup () {
     if [ -z "$D" ]; then
         # This is to make sure postgres is configured and running
         if ! pidof postmaster > /dev/null; then
@@ -80,18 +80,18 @@ pkg_postinst_${SRCNAME}-setup () {
 }
 
 PACKAGES += "${SRCNAME}-tests ${SRCNAME}-api ${SRCNAME} ${SRCNAME}-setup"
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
 
-FILES_${PN} = "${libdir}/*"
+FILES:${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \
     "
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     "
 
-FILES_${SRCNAME}-api = "${bindir}/rally-api \
+FILES:${SRCNAME}-api = "${bindir}/rally-api \
     ${sysconfdir}/init.d/rally-api \
     "
 
@@ -105,7 +105,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " python-babel \
+RDEPENDS:${PN} += " python-babel \
     python-decorator \
     python-fixtures \
     python-iso8601 \
@@ -131,7 +131,7 @@ RDEPENDS_${PN} += " python-babel \
     python-wsme \
     "
 
-RDEPENDS_${SRCNAME}-tests = "${PN} \
+RDEPENDS:${SRCNAME}-tests = "${PN} \
    python-coverage \
    python-mock \
    python-testrepository \
@@ -139,14 +139,14 @@ RDEPENDS_${SRCNAME}-tests = "${PN} \
    python-oslotest \
    "
 
-RDEPENDS_${SRCNAME} = "${PN} \
+RDEPENDS:${SRCNAME} = "${PN} \
    postgresql \
    postgresql-client \
    "
 
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
+RDEPENDS:${SRCNAME}-api = "${SRCNAME}"
 
 INITSCRIPT_PACKAGES = "${SRCNAME}-api"
-INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api"
-INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api"
+INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
index be10558..83fc88c 100644
--- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-FILES_${PN} += "${datadir}/etc/${SRCNAME}/*"
+FILES:${PN} += "${datadir}/etc/${SRCNAME}/*"
 
 DEPENDS += " \
         python-pip \
@@ -26,7 +26,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-eventlet \
         python-msgpack \
         python-netaddr \
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index a5998eb..675a185 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -48,7 +48,7 @@ python () {
     d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
 }
 
-do_install_append() {
+do_install:append() {
     SWIFT_CONF_DIR=${D}${sysconfdir}/swift
 
     install -d ${SWIFT_CONF_DIR}
@@ -108,7 +108,7 @@ do_install_append() {
 
 }
 
-pkg_postinst_${SRCNAME}-setup () {
+pkg_postinst:${SRCNAME}-setup () {
     if [ -z "x$D" ]; then
         CLUSTER_CONF=/etc/swift/cluster.conf
         SWIFT_SETUP='/bin/bash /etc/swift/swift_setup.sh'
@@ -133,18 +133,18 @@ pkg_postinst_${SRCNAME}-setup () {
 
 PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup"
 
-FILES_${PN} = "${libdir}/*\
+FILES:${PN} = "${libdir}/*\
 "
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/test.conf \
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/test.conf \
 "
 
-FILES_${SRCNAME}-setup = "${sysconfdir}/init.d/swift \
+FILES:${SRCNAME}-setup = "${sysconfdir}/init.d/swift \
     ${sysconfdir}/${SRCNAME}/swift_setup.sh \
     ${sysconfdir}/${SRCNAME}/cluster.conf \
 "
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
 "
 
@@ -158,7 +158,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     python-eventlet \
     python-greenlet \
     python-pastedeploy \
@@ -171,11 +171,11 @@ RDEPENDS_${PN} += " \
     bash \
     "
 
-RDEPENDS_${SRCNAME} = "${PN}"
+RDEPENDS:${SRCNAME} = "${PN}"
 
-RDEPENDS_${SRCNAME} = "${PN}"
-RDEPENDS_${SRCNAME}-setup = "${SRCNAME}"
+RDEPENDS:${SRCNAME} = "${PN}"
+RDEPENDS:${SRCNAME}-setup = "${SRCNAME}"
 
 INITSCRIPT_PACKAGES = "${SRCNAME}-setup"
-INITSCRIPT_NAME_${SRCNAME}-setup = "swift"
-INITSCRIPT_PARAMS_${SRCNAME}-setup = "defaults"
+INITSCRIPT_NAME:${SRCNAME}-setup = "swift"
+INITSCRIPT_PARAMS:${SRCNAME}-setup = "defaults"
diff --git a/meta-openstack/recipes-devtools/python/python-tox.inc b/meta-openstack/recipes-devtools/python/python-tox.inc
index 66b1355..c483424 100644
--- a/meta-openstack/recipes-devtools/python/python-tox.inc
+++ b/meta-openstack/recipes-devtools/python/python-tox.inc
@@ -10,13 +10,13 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-virtualenv \
         ${PYTHON_PN}-py \
         ${PYTHON_PN}-pytest \
         "
 
-do_install_append() {
+do_install:append() {
 
     install -d ${D}/${sysconfdir}/${SRCNAME}
     cp ${S}/tox.ini    ${D}/${sysconfdir}/${SRCNAME}
@@ -26,4 +26,4 @@ do_install_append() {
     ln -s ${PYTHON_SITEPACKAGES_DIR}/tox ${D}/${sysconfdir}/${SRCNAME}/tox
 }
 
-FILES_${PN} += "${sysconfdir}/${SRCNAME}/*"
+FILES:${PN} += "${sysconfdir}/${SRCNAME}/*"
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index f5a75a0..7e6b6f6 100755
--- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
@@ -36,7 +36,7 @@ python () {
 }
 SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
     TROVE_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
     TROVE_LOG_DIR="/var/log/${SRCNAME}"
@@ -144,7 +144,7 @@ do_install_append() {
 }
 
 
-pkg_postinst_${SRCNAME}-setup () {
+pkg_postinst:${SRCNAME}-setup () {
     # python-trove-setup postinst start
     if [ -z "$D" ]; then
         source /etc/nova/openrc
@@ -173,8 +173,8 @@ pkg_postinst_${SRCNAME}-setup () {
 
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system trove"
-USERADD_PARAM_${PN}  = "--system --home /var/lib/trove -g trove \
+GROUPADD_PARAM:${PN} = "--system trove"
+USERADD_PARAM:${PN}  = "--system --home /var/lib/trove -g trove \
                         --no-create-home --shell /bin/false trove"
 
 PROVIDES += " \
@@ -191,42 +191,42 @@ PACKAGES += " \
     ${SRCNAME}-taskmanager \
     "
 
-PACKAGES_prepend = " \
+PACKAGES:prepend = " \
     ${SRCNAME}-tests \
     "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${libdir}/* \
     "
 
-FILES_${SRCNAME}-tests = " \
+FILES:${SRCNAME}-tests = " \
     ${libdir}/python*/site-packages/${SRCNAME}/tests/* \
     "
 
-ALLOW_EMPTY_${SRCNAME} = "1"
-FILES_${SRCNAME} = " \
+ALLOW_EMPTY:${SRCNAME} = "1"
+FILES:${SRCNAME} = " \
     "
 
-FILES_${SRCNAME}-api = " \
+FILES:${SRCNAME}-api = " \
     ${sysconfdir}/init.d/trove-api \
     "
-ALLOW_EMPTY_${SRCNAME}-api = "1"
+ALLOW_EMPTY:${SRCNAME}-api = "1"
 
-FILES_${SRCNAME}-bin = " \
+FILES:${SRCNAME}-bin = " \
     ${bindir}/* \
     "
 
-FILES_${SRCNAME}-conductor = " \
+FILES:${SRCNAME}-conductor = " \
     ${sysconfdir}/init.d/trove-conductor \
     "
-ALLOW_EMPTY_${SRCNAME}-conductor = "1"
+ALLOW_EMPTY:${SRCNAME}-conductor = "1"
 
-FILES_${SRCNAME}-taskmanager = " \
+FILES:${SRCNAME}-taskmanager = " \
     ${sysconfdir}/init.d/trove-taskmanager \
     "
-ALLOW_EMPTY_${SRCNAME}-taskmanager = "1"
+ALLOW_EMPTY:${SRCNAME}-taskmanager = "1"
 
-FILES_${SRCNAME}-setup = " \
+FILES:${SRCNAME}-setup = " \
     ${localstatedir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     "
@@ -243,7 +243,7 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     python-babel \
     python-cinderclient \
     python-eventlet \
@@ -273,7 +273,7 @@ RDEPENDS_${PN} += " \
     uwsgi \
     "
 
-RDEPENDS_${SRCNAME} = " \
+RDEPENDS:${SRCNAME} = " \
     ${PN} \
     ${SRCNAME}-api \
     ${SRCNAME}-bin \
@@ -283,19 +283,19 @@ RDEPENDS_${SRCNAME} = " \
     troveclient \
     "
 
-RDEPENDS_${SRCNAME}-api = " \
+RDEPENDS:${SRCNAME}-api = " \
     ${SRCNAME}-setup \
     "
 
-RDEPENDS_${SRCNAME}-bin = " \
+RDEPENDS:${SRCNAME}-bin = " \
     ${PN} \
     "
 
-RDEPENDS_${SRCNAME}-conductor = " \
+RDEPENDS:${SRCNAME}-conductor = " \
     ${SRCNAME}-setup \
     "
 
-RDEPENDS_${SRCNAME}-setup = " \
+RDEPENDS:${SRCNAME}-setup = " \
     ${PN} \
     ${SRCNAME}-bin \
     keystone-setup \
@@ -306,11 +306,11 @@ RDEPENDS_${SRCNAME}-setup = " \
     sudo \
     "
 
-RDEPENDS_${SRCNAME}-taskmanager = " \
+RDEPENDS:${SRCNAME}-taskmanager = " \
     ${SRCNAME}-setup \
     "
 
-RDEPENDS_${SRCNAME}-tests += " \
+RDEPENDS:${SRCNAME}-tests += " \
     python-mock \
     python-pexpect \
     "
@@ -318,11 +318,11 @@ RDEPENDS_${SRCNAME}-tests += " \
 
 INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-conductor ${SRCNAME}-taskmanager"
 
-INITSCRIPT_NAME_${SRCNAME}-api = "trove-api"
-INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-api = "trove-api"
+INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
-INITSCRIPT_NAME_${SRCNAME}-conductor = "trove-conductor"
-INITSCRIPT_PARAMS_${SRCNAME}-conductor = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-conductor = "trove-conductor"
+INITSCRIPT_PARAMS:${SRCNAME}-conductor = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
-INITSCRIPT_NAME_${SRCNAME}-taskmanager = "trove-taskmanager"
-INITSCRIPT_PARAMS_${SRCNAME}-taskmanager = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME:${SRCNAME}-taskmanager = "trove-taskmanager"
+INITSCRIPT_PARAMS:${SRCNAME}-taskmanager = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
index 64ab166..9955f2e 100644
--- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
@@ -29,23 +29,23 @@ PACKAGES += " \
     ${SRCNAME}-bin \
     "
 
-PACKAGES_prepend = " \
+PACKAGES:prepend = " \
     ${SRCNAME}-tests \
     "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${libdir}/* \
     "
 
-FILES_${SRCNAME}-tests = " \
+FILES:${SRCNAME}-tests = " \
     ${libdir}/python*/site-packages/${SRCNAME}/tests/* \
     "
 
-ALLOW_EMPTY_${SRCNAME} = "1"
-FILES_${SRCNAME} = " \
+ALLOW_EMPTY:${SRCNAME} = "1"
+FILES:${SRCNAME} = " \
     "
 
-FILES_${SRCNAME}-bin = " \
+FILES:${SRCNAME}-bin = " \
     ${bindir}/* \
     "
 
@@ -54,7 +54,7 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python-pbr \
         python-prettytable \
         python-requests \
@@ -65,9 +65,9 @@ RDEPENDS_${PN} += " \
         python-keystoneclient \
         "
 
-RDEPENDS_${SRCNAME}-tests += "python-mock"
+RDEPENDS:${SRCNAME}-tests += "python-mock"
 
-RDEPENDS_${SRCNAME} += " \
+RDEPENDS:${SRCNAME} += " \
     ${PN} \
     ${SRCNAME}-bin \
     "
@@ -77,6 +77,6 @@ DEPENDS += " \
         python-pbr-native \
         "
 
-RDEPENDS_${SRCNAME}-bin += " \
+RDEPENDS:${SRCNAME}-bin += " \
     ${PN} \
     "
diff --git a/meta-openstack/recipes-devtools/python/python-virtualenv.inc b/meta-openstack/recipes-devtools/python/python-virtualenv.inc
index 79b9451..e24cda1 100644
--- a/meta-openstack/recipes-devtools/python/python-virtualenv.inc
+++ b/meta-openstack/recipes-devtools/python/python-virtualenv.inc
@@ -13,6 +13,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-dateutil \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-amqp_2.6.1.bb b/meta-openstack/recipes-devtools/python/python3-amqp_2.6.1.bb
index e2f8282..dd25768 100644
--- a/meta-openstack/recipes-devtools/python/python3-amqp_2.6.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-amqp_2.6.1.bb
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4
 
 inherit pypi setuptools3
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-vine \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
index 65e4a03..449063f 100644
--- a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-dateutil \
         ${PYTHON_PN}-backports-functools-lru-cache \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb
index 7278dcc..92a1393 100644
--- a/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         python3-debtcollector \
diff --git a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
index b5d3e77..f92f979 100644
--- a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
+++ b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
@@ -1,4 +1,4 @@
-RDEPENDS_${PN} += "python3-core python3-dbus"
+RDEPENDS:${PN} += "python3-core python3-dbus"
 SUMMARY = "Python bindings for the avahi zeroconf client"
 HOMEPAGE = "https://github.com/lathiat/avahi"
 SECTION = "devel/python"
@@ -30,4 +30,4 @@ do_install () {
                 ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/avahi-bookmarks
 }
 
-FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/avahi"
+FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/avahi"
diff --git a/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb b/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb
index b83a23f..1ac1d3f 100644
--- a/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "ddf6e1d59ce30deb190478c98ade84557ee9333435fbd377c011588c71
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-netclient \
         python3-netserver \
         python3-json \
diff --git a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
index 8b34708..53f1ed9 100644
--- a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-requests \
         python3-six \
diff --git a/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb b/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb
index fe09e9f..b0025c4 100644
--- a/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a1067d091272fcce8cc3d88d7e6fdc01"
 SRC_URI[md5sum] = "e9b79f80198da059d9a8055a5352fd6d"
 SRC_URI[sha256sum] = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
         python3-json \
         python3-netclient \
         python3-threading \
diff --git a/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb b/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb
index 5dd45da..e9b2db7 100644
--- a/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-babel \
         python3-cryptography \
diff --git a/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb b/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb
index 65e84bf..a5769d6 100644
--- a/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb
+++ b/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb
@@ -18,8 +18,8 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-lxml \
         ${PYTHON_PN}-requests \
         ${PYTHON_PN}-cython \
diff --git a/meta-openstack/recipes-devtools/python/python3-cliff_3.6.0.bb b/meta-openstack/recipes-devtools/python/python3-cliff_3.6.0.bb
index 29d38e0..a26ae86 100644
--- a/meta-openstack/recipes-devtools/python/python3-cliff_3.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-cliff_3.6.0.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
     ${PYTHON_PN}-pbr-native \
     "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
             ${PYTHON_PN}-cmd2 \
             ${PYTHON_PN}-pbr \
             ${PYTHON_PN}-pyparsing \
diff --git a/meta-openstack/recipes-devtools/python/python3-cssselect_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-cssselect_1.1.0.bb
index e0a41b8..a13a218 100644
--- a/meta-openstack/recipes-devtools/python/python3-cssselect_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-cssselect_1.1.0.bb
@@ -15,6 +15,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb
index 770acdc..2a68108 100644
--- a/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb
@@ -17,7 +17,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-lxml \
         python3-cryptography \
diff --git a/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
index 4c6bf70..65e1bbd 100644
--- a/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
@@ -19,8 +19,8 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
+# RDEPENDS:default:
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-wrapt \
         ${PYTHON_PN}-six \
diff --git a/meta-openstack/recipes-devtools/python/python3-deprecation_2.1.0.bb b/meta-openstack/recipes-devtools/python/python3-deprecation_2.1.0.bb
index c819529..4976b56 100644
--- a/meta-openstack/recipes-devtools/python/python3-deprecation_2.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-deprecation_2.1.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI[md5sum] = "6b79c6572fb241e3cecbbd7d539bb66b"
 SRC_URI[sha256sum] = "72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
         python3-packaging \
 "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb b/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb
index 153429b..605c63a 100644
--- a/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
 SRC_URI[md5sum] = "51e6aaf70e253c999824c7bc29009f5e"
 SRC_URI[sha256sum] = "cf0e76540530491a6100164c514e1c60b55efa25c8db4c18f4902c988d7c1080"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-cliff \
         python3-jsonschema \
         python3-osc-lib \
diff --git a/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.4.bb
index 0fb09e1..cffcb35 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.4.bb
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "be58deb54a43d77d2e1621fe59f787681376d3cd0b8bd8e4758ef6c3a6
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-django \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb b/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb
index 80c5405..0c4dd75 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb
@@ -13,7 +13,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-django \
         python3-babel \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb b/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb
index 40a0133..7e50557 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb
@@ -11,13 +11,13 @@ SRC_URI[sha256sum] = "ae0051bc0c7a0660c93434e68d617553fccdd573293dfd15aa33f78d2b
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-django-appconf  \
         python3-rcssmin  \
         python3-rjsmin  \
         "
 
-do_install_append() {
+do_install:append() {
     # Ensure permisive perms are granted
     find -L "${D}${PYTHON_SITEPACKAGES_DIR}/compressor" -type f -exec chmod 644 {} \;
     find -L "${D}${PYTHON_SITEPACKAGES_DIR}/compressor" -type d -exec chmod 755 {} \;
diff --git a/meta-openstack/recipes-devtools/python/python3-django-nose_1.4.7.bb b/meta-openstack/recipes-devtools/python/python3-django-nose_1.4.7.bb
index bea4bd7..3fb8b63 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-nose_1.4.7.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-nose_1.4.7.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-django \
         python3-nose \
         python3-misc \
diff --git a/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb b/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb
index 4e6c2d2..cee4b85 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb
@@ -15,7 +15,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-django \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
index 0d6cc41..8cacdd0 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
@@ -15,8 +15,8 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-django \
         python3-pyscss \        
         python3-pathlib \
diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb
index 941e114..745de51 100644
--- a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-decorator \
         python3-logging \
         python3-numbers \
diff --git a/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb b/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb
index 648a7dd..53e99b1 100644
--- a/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6
 inherit setuptools3 pypi
 
 # conflicting file prevention
-do_install_append() {
+do_install:append() {
         rm -f ${D}${libdir}/python*/site-packages/tests/*
 }
 
@@ -18,7 +18,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-six \
         python3-json \
         python3-xml \
diff --git a/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
index c2e098f..6cd0d81 100644
--- a/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
@@ -23,6 +23,6 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += "python3-testtools \
+RDEPENDS:${PN} += "python3-testtools \
         python3-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb b/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb
index cc860c4..0eaa031 100644
--- a/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += "python3-prettytable \
+RDEPENDS:${PN} += "python3-prettytable \
             python3-cmd2 \
             python3-pyparsing \
             python3-mccabe \
diff --git a/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb b/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb
index 2e63d90..08b7e32 100644
--- a/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         python3-monotonic \
diff --git a/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb b/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb
index dc6435f..404ab5a 100644
--- a/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-gevent \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
index 5079958..7dc729c 100644
--- a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         bash \
         python3-oslo.config \
         python3-oslo.i18n \
diff --git a/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb b/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb
index 56b6c79..c8f9135 100644
--- a/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "850b4ee651128588a57e1e152dd1252e5ec39776a5d3d14ee892b8bac0
 
 inherit setuptools3 pypi
 
-do_install_append() {
+do_install:append() {
         perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt")
         perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO")
         for f in $perm_files; do
diff --git a/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb b/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb
index 4b732ca..99c87b3 100644
--- a/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb
+++ b/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
         ${PYTHON_PN}-crypt \
         ${PYTHON_PN}-logging \
         ${PYTHON_PN}-json \
diff --git a/meta-openstack/recipes-devtools/python/python3-i18n_0.3.9.bb b/meta-openstack/recipes-devtools/python/python3-i18n_0.3.9.bb
index 92a5aa3..e9e1d69 100644
--- a/meta-openstack/recipes-devtools/python/python3-i18n_0.3.9.bb
+++ b/meta-openstack/recipes-devtools/python/python3-i18n_0.3.9.bb
@@ -17,7 +17,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pyyaml \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
index 008ae39..2706954 100644
--- a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
@@ -14,6 +14,6 @@ DEPENDS += " \
         python3-pbr \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb b/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb
index 3a9a8e6..24546cf 100644
--- a/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-math \
         python3-json \
         python3-numbers \
diff --git a/meta-openstack/recipes-devtools/python/python3-jsonext_0.4.2.bb b/meta-openstack/recipes-devtools/python/python3-jsonext_0.4.2.bb
index 0bf227a..5a994d0 100644
--- a/meta-openstack/recipes-devtools/python/python3-jsonext_0.4.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-jsonext_0.4.2.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "e7634e0b8d1a668bd2c92db5498f6162573feb72ac050c4415384e773b
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-six \
         python3-arrow \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb b/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb
index a4517a6..7a08f95 100644
--- a/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-babel \
         python3-jsonpath-rw \
diff --git a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
index e4aed01..b40e39c 100644
--- a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
@@ -19,7 +19,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-six \
         ${PYTHON_PN}-logging \
         ${PYTHON_PN}-compression \
diff --git a/meta-openstack/recipes-devtools/python/python3-kazoo_2.8.0.bb b/meta-openstack/recipes-devtools/python/python3-kazoo_2.8.0.bb
index 554e165..e88f21a 100644
--- a/meta-openstack/recipes-devtools/python/python3-kazoo_2.8.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-kazoo_2.8.0.bb
@@ -20,6 +20,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb b/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb
index 1eba7f6..2d8f51d 100644
--- a/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb
@@ -15,7 +15,7 @@ DEPENDS += " \
         python3-toml-native \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
         python3-logging \
         python3-importlib-metadata \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.3.0.bb b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.3.0.bb
index 972668c..6557f6c 100644
--- a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.3.0.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-iso8601 \
         ${PYTHON_PN}-requests \
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
index c8fe38a..7511de3 100644
--- a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3 monitor
 
-FILES_${PN}-doc += "${datadir}/keystoneclient" 
+FILES:${PN}-doc += "${datadir}/keystoneclient" 
 
 DEPENDS += " \
         python3-pip \
@@ -31,7 +31,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         bash \
         python3-pbr \
         python3-debtcollector \
@@ -46,15 +46,15 @@ RDEPENDS_${PN} += " \
         python3-stevedore \
         "
 
-do_install_append() {
+do_install:append() {
         cp -r ${S}/examples ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}
 }
 
 PACKAGES =+ " ${SRCNAME}-tests"
 
-FILES_${SRCNAME}-tests = "${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \
+FILES:${SRCNAME}-tests = "${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \
         "
-RDEPENDS_${SRCNAME}-tests += " \
+RDEPENDS:${SRCNAME}-tests += " \
         python3-httpretty \
         bash \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb
index b9f0f79..66ed642 100644
--- a/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb
@@ -26,7 +26,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-keystoneauth1 \
         python3-oslo.config \
         python3-oslo.context \
diff --git a/meta-openstack/recipes-devtools/python/python3-kombu_5.0.2.bb b/meta-openstack/recipes-devtools/python/python3-kombu_5.0.2.bb
index dfcde9d..bd06f3e 100644
--- a/meta-openstack/recipes-devtools/python/python3-kombu_5.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-kombu_5.0.2.bb
@@ -9,8 +9,8 @@ SRC_URI[sha256sum] = "f4965fba0a4718d47d470beeb5d6446e3357a62402b16c510b6a2f251e
 
 inherit setuptools3 pypi
 
-FILES_${PN}-doc += "${datadir}/${SRCNAME}"
+FILES:${PN}-doc += "${datadir}/${SRCNAME}"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
         ${PYTHON_PN}-amqp \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-lesscpy_0.14.0.bb b/meta-openstack/recipes-devtools/python/python3-lesscpy_0.14.0.bb
index 64417b3..74da06d 100644
--- a/meta-openstack/recipes-devtools/python/python3-lesscpy_0.14.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-lesscpy_0.14.0.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a01aae31681ac25b4c46f98d627b9b5d"
 
 DEPENDS += "${PYTHON_PN}-ply"
-RDEPENDS_${PN} += "${PYTHON_PN}-ply"
+RDEPENDS:${PN} += "${PYTHON_PN}-ply"
 
 SRC_URI[md5sum] = "efe82be479ddb7bdc48b2114dab94b20"
 SRC_URI[sha256sum] = "7b664f60818a16afa8cc9f1dd6d9b17f944e0ce94e50787d76f81bc7a8648cce"
diff --git a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
index 8009060..81e1f22 100644
--- a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
@@ -18,6 +18,6 @@ DEPENDS += " \
     python3-pbr-native \
     "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     python3-pbr \
     "
diff --git a/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb b/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb
index 9914f4c..6867600 100644
--- a/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} +=" \
+RDEPENDS:${PN} +=" \
         python3-pbr \
         python3-babel \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb b/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb
index c0a5521..7e51ec6 100644
--- a/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} +=" \
+RDEPENDS:${PN} +=" \
         python3-pbr \
         python3-iso8601 \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb b/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb
index 8d189f8..cb7dadc 100644
--- a/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb
@@ -18,8 +18,8 @@ DEPENDS += " \
         ${PYTHON_PN}-six-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-io \
         ${PYTHON_PN}-six \
         ${PYTHON_PN}-logging \
diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
index a129725..4e6f40e 100644
--- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${PYTHON_PN}-six \
     ${PYTHON_PN}-pickle \
     "
diff --git a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
index 43eead6..3cf8b73 100644
--- a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
@@ -22,6 +22,6 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
         
diff --git a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
index 9d8f9e2..da87dfd 100644
--- a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
@@ -16,6 +16,6 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} \
     --install-lib=${PYTHON_SITEPACKAGES_DIR} \
     --install-data=${datadir}"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-netserver \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb b/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb
index dd0eb90..7f79754 100644
--- a/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} +=" \
+RDEPENDS:${PN} +=" \
         python3-cliff \
         python3-pbr \
         python3-keystoneclient \
diff --git a/meta-openstack/recipes-devtools/python/python3-mox3_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-mox3_1.1.0.bb
index 9608077..c7e28fe 100644
--- a/meta-openstack/recipes-devtools/python/python3-mox3_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mox3_1.1.0.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
     python3-pbr-native \
     "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     python3-pbr \
     python3-fixtures \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb b/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb
index 58f40d0..8cd800c 100644
--- a/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb
@@ -13,7 +13,7 @@ DEPENDS += " \
         python3-pbr-native \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pkg-resources \
         python3-six \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
index e07cfbf..2127ccf 100644
--- a/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-nose \
         "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.3.bb b/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.3.bb
index 0583c97..7943e39 100644
--- a/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.3.bb
@@ -9,7 +9,7 @@ inherit setuptools3 pypi
 SRC_URI[md5sum] = "3a9eb781f685949c04946f6c09e4c11d"
 SRC_URI[sha256sum] = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-httplib2 \
         ${PYTHON_PN}-pyasn1 \
         ${PYTHON_PN}-pyasn1-modules \
diff --git a/meta-openstack/recipes-devtools/python/python3-openstack-nose_0.11.bb b/meta-openstack/recipes-devtools/python/python3-openstack-nose_0.11.bb
index 9cdc9a2..9dcbb7f 100644
--- a/meta-openstack/recipes-devtools/python/python3-openstack-nose_0.11.bb
+++ b/meta-openstack/recipes-devtools/python/python3-openstack-nose_0.11.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-nose \
         python3-colorama \
         python3-termcolor \
diff --git a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
index 7c14818..3a78fb9 100644
--- a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
@@ -23,7 +23,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         bash \
         python3-jsonpatch \
diff --git a/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb b/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb
index 9fa676b..7fa2710 100644
--- a/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb
@@ -15,7 +15,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
     ${PYTHON_PN}-pip \
     "
diff --git a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
index 4fc01f6..c52526a 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-FILES_${PN} += "${datadir}/etc/*"
+FILES:${PN} += "${datadir}/etc/*"
 
 DEPENDS += " \
         python3-pbr \
@@ -25,7 +25,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-babel \
         python3-eventlet \
diff --git a/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb b/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb
index a686d6a..71f756a 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb
@@ -12,6 +12,6 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
index 72bd1b2..69ab223 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
index 18a9e6b..82e53b1 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
@@ -23,7 +23,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-netaddr \
         python3-oslo.concurrency \
diff --git a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
index 5a2b765..bbbd96c 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
@@ -23,7 +23,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-babel \
         python3-eventlet \
diff --git a/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb b/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb
index d88d0a0..9055da7 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
         
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         bash \
         python3-pbr \
         python3-babel \
diff --git a/meta-openstack/recipes-devtools/python/python3-osc-lib_2.3.0.bb b/meta-openstack/recipes-devtools/python/python3-osc-lib_2.3.0.bb
index bbbcdf3..2169e44 100644
--- a/meta-openstack/recipes-devtools/python/python3-osc-lib_2.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-osc-lib_2.3.0.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-six \
         ${PYTHON_PN}-babel \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
index 604abca..8b087b2 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
@@ -26,8 +26,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-dogpile.cache \
         python3-six \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
index 8b2043b..04178c2 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
@@ -26,8 +26,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-fasteners \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb b/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb
index 3b89b51..e7557df 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     python3-requests \
     python3-netaddr \
     python3-stevedore \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
index 4b733fd..9a0caa8 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
@@ -23,8 +23,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         bash \
         python3-pbr \
         python3-debtcollector \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
index 3a78391..ed5a2fc 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
        python3-six \
        python3-alembic \
        python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
index 6cfd374..59a5a0a 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
@@ -26,8 +26,8 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-babel \
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-six \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
index 308b39e..6536478 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
@@ -24,8 +24,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         bash \
         python3-pbr \
         python3-six \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
index 9582c6b..4f201fe 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
@@ -25,8 +25,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         bash \
         python3-pbr \
         python3-cachetools \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
index a481818..090a365 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
@@ -26,8 +26,8 @@ DEPENDS += " \
         "
 
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-jinja2 \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
index b317444..fac6ba9 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
@@ -25,7 +25,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-oslo.config \
         python3-oslo.i18n \
         python3-oslo.serialization \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
index 27da695..46f95c0 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
@@ -22,8 +22,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
+# RDEPENDS:default:
+RDEPENDS:${PN} += " \
         python3-oslo.log \
         python3-oslo.i18n \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
index a3377e6..2706df0 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
@@ -24,8 +24,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         python3-jinja2 \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
index 2d311b5..5e3bb7c 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
@@ -26,8 +26,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
index 36e9424..3935026 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
@@ -25,8 +25,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         python3-oslo.utils \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
index 3598ea0..c2f6702 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-webob \
         python3-eventlet \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
index 8315443..7036bd0 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
@@ -24,8 +24,8 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
+# RDEPENDS:default:
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-six \
         ${PYTHON_PN}-iso8601 \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
index 41064dd..e3bfc53 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
@@ -24,8 +24,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-six \
         python3-oslo.concurrency \
         python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
index 99fd8a9..6f060be 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-stevedore \
         python3-netaddr \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
index ecc0672..04f6d49 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
@@ -25,7 +25,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} = "python3-fixtures \
+RDEPENDS:${PN} = "python3-fixtures \
                   python3-subunit \
                   python3-six \
                   python3-testrepository \
diff --git a/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
index 5d7939b..c7f84b4 100644
--- a/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
@@ -21,8 +21,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         python3-oslo.messaging \
diff --git a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
index 4c0510c..bdd0503 100644
--- a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
@@ -25,7 +25,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-fixtures \
         python3-ovs \
         python3-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb b/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb
index c08644f..7fc062a 100644
--- a/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb
@@ -13,7 +13,7 @@ inherit setuptools3 pypi
 
 DEPENDS += "${PYTHON_PN}-pytest-runner-native"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-paste \
         ${PYTHON_PN}-setuptools \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb b/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb
index 059b4ff..048eeb5 100644
--- a/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb
@@ -19,5 +19,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-pecan_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-pecan_1.4.0.bb
index ff457d6..b772ca4 100644
--- a/meta-openstack/recipes-devtools/python/python3-pecan_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pecan_1.4.0.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} = "${PYTHON_PN}-mako \
+RDEPENDS:${PN} = "${PYTHON_PN}-mako \
                   ${PYTHON_PN}-webtest \
                   ${PYTHON_PN}-six \
                   ${PYTHON_PN}-logutils \
diff --git a/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb b/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb
index b9d36ec..213b55a 100644
--- a/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb
@@ -10,6 +10,6 @@ SRC_URI[sha256sum] = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f3
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${PYTHON_PN}-pika \
     "
diff --git a/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb b/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb
index 5e2f178..d160ac9 100644
--- a/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb
@@ -16,6 +16,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${PYTHON_PN}-wrapt \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb
index 2e8dca0..bd010ac 100644
--- a/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb
@@ -20,6 +20,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
index 6e864e8..b243a4a 100644
--- a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-FILES_${PN} += "${datadir}/etc/${SRCNAME}/*"
+FILES:${PN} += "${datadir}/etc/${SRCNAME}/*"
 
 DEPENDS += " \
         python3-pip \
@@ -25,7 +25,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
       python3-babel \
       python3-iso8601 \
       python3-netaddr \
diff --git a/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb b/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb
index e659f61..a05712b 100644
--- a/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-lxml \
         python3-oslo.concurrency \
         python3-oslo.context \
diff --git a/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb b/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb
index bfd1c48..3e585f7 100644
--- a/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb
@@ -12,7 +12,7 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-zopeinterface \
         python3-repoze.who \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb b/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb
index 0c7528a..79008c6 100644
--- a/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb
@@ -19,8 +19,8 @@ DEPENDS += " \
         python3-six \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         python3-logging \
         python3-six \
         python3-numbers \
diff --git a/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb b/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb
index 06ea97a..c7acfae 100644
--- a/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "0c3dbef2f958caca96071fe5c19de43e9c1b0484ab02a0cf08b190bcee
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += "${PYTHON_PN}-pycrypto \
+RDEPENDS:${PN} += "${PYTHON_PN}-pycrypto \
                    ${PYTHON_PN}-pyasn1 \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb
index f8a19e7..610a27e 100644
--- a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "fcc29c9e8208eda8955367c11607e72467a68564d5afbcf632b1dd6ecf
 
 inherit pypi setuptools3
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ${PYTHON_PN}-pytest \
     ${PYTHON_PN}-pytest-tempdir \
     ${PYTHON_PN}-pytest-helpers-namespace \
diff --git a/meta-openstack/recipes-devtools/python/python3-python-editor_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-python-editor_1.0.4.bb
index fea7093..3f4dd5d 100644
--- a/meta-openstack/recipes-devtools/python/python3-python-editor_1.0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-python-editor_1.0.4.bb
@@ -12,5 +12,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb b/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb
index 7409cdc..cd890e0 100644
--- a/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1b
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
 
 CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb b/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb
index 0f782ee..6de7a43 100644
--- a/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb
+++ b/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb
@@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db8
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-netclient \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-repoze.who_2.4.bb b/meta-openstack/recipes-devtools/python/python3-repoze.who_2.4.bb
index e75490d..98f24f3 100644
--- a/meta-openstack/recipes-devtools/python/python3-repoze.who_2.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-repoze.who_2.4.bb
@@ -15,8 +15,8 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
     ${PYTHON_PN}-pip \
     ${PYTHON_PN}-zopeinterface \
     "
diff --git a/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb
index 4bf9c0e..0760c27 100644
--- a/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77d
 inherit setuptools3 pypi
 
 # conflicting file prevention
-do_install_append() {
+do_install:append() {
         rm -f ${D}${libdir}/python*/site-packages/tests/*
 }
 
@@ -18,6 +18,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb
index e599670..706f978 100644
--- a/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb
@@ -15,6 +15,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
index e5ac0e6..09b1003 100644
--- a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
@@ -15,6 +15,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-rjsmin_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-rjsmin_1.1.0.bb
index 6c3b55b..15bba29 100644
--- a/meta-openstack/recipes-devtools/python/python3-rjsmin_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rjsmin_1.1.0.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "b15dc75c71f65d9493a8c7fa233fdcec823e3f1b88ad84a843ffef49b3
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
 
 CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb b/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb
index 309bb29..413ac47 100644
--- a/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb
@@ -10,7 +10,7 @@ PYPI_PACKAGE = "Routes"
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-netclient \        
         ${PYTHON_PN}-six \      
         ${PYTHON_PN}-repoze.lru \       
diff --git a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb
index e1eef6b..929fb50 100644
--- a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb
@@ -15,8 +15,8 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-json \
         ${PYTHON_PN}-shell \
         ${PYTHON_PN}-six \
diff --git a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
index 9ec4c56..c75ef5d 100644
--- a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PYTHON_PN}-pbr \
         "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
index fdc0341..d146730 100644
--- a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
@@ -13,7 +13,7 @@ PV = "2018.9.21+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
                   python3-mock \
                   python3-unittest \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb b/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb
index 34b40de..98fec91 100644
--- a/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9
 inherit setuptools3 pypi
 
 # conflicting file prevention
-do_install_append() {
+do_install:append() {
         rm -f ${D}${libdir}/python*/site-packages/site.py*
 }
 BBCLASSEXTEND = "native"
diff --git a/meta-openstack/recipes-devtools/python/python3-sqlalchemy-migrate_0.13.0.bb b/meta-openstack/recipes-devtools/python/python3-sqlalchemy-migrate_0.13.0.bb
index 5142e13..32685ef 100644
--- a/meta-openstack/recipes-devtools/python/python3-sqlalchemy-migrate_0.13.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-sqlalchemy-migrate_0.13.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-sqlalchemy \
         python3-decorator \
diff --git a/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb b/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb
index 0c0cc6a..96ef949 100644
--- a/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb
@@ -9,5 +9,5 @@ inherit setuptools3 pypi
 SRC_URI[md5sum] = "b397ccf880f37cf099e775907ebf7a46"
 SRC_URI[sha256sum] = "e3e6db4c246f7c59003e51c9720a51a7f39a396541cb9b147ff4b14d15b5dd1f"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb b/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb
index 183eab0..5cff8ee 100644
--- a/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb
+++ b/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb
@@ -15,6 +15,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb b/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb
index 1025d9e..6ca6154 100644
--- a/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "66227eaf29a691c70675fb9982022980b92797c273dd5e6dc7e680425e
 
 inherit pypi setuptools3 python3-dir
 
-do_install_append() {
+do_install:append() {
     cp -r test ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/
 }
 
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-simplejson \
         python3-pbr \
         python3-requests \
diff --git a/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb b/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb
index ac5931f..3b0bb8b 100644
--- a/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb
@@ -15,6 +15,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
index a9c4c30..193f80e 100644
--- a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-six \
         python3-futurist \
diff --git a/meta-openstack/recipes-devtools/python/python3-tenacity_6.2.0.bb b/meta-openstack/recipes-devtools/python/python3-tenacity_6.2.0.bb
index bcab75a..0e5069a 100644
--- a/meta-openstack/recipes-devtools/python/python3-tenacity_6.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-tenacity_6.2.0.bb
@@ -17,7 +17,7 @@ DEPENDS += " \
          python3-setuptools-scm-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-six \
         python3-monotonic \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb b/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb
index 7847b0c..eb5e8d0 100644
--- a/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb
+++ b/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += "${PYTHON_PN}-subunit \
+RDEPENDS:${PN} += "${PYTHON_PN}-subunit \
                    ${PYTHON_PN}-extras \
 "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb b/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb
index 111be3c..ee34c3d 100644
--- a/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb
@@ -13,7 +13,7 @@ DEPENDS += " \
         python3-pbr-native \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-unittest \
         python3-pbr \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb b/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb
index 92523c2..79b03fb 100644
--- a/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
     ${PYTHON_PN}-pbr-native \
     "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     ${PYTHON_PN}-testtools \
     ${PYTHON_PN}-pbr \
     "
diff --git a/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb
index f77cebe..e86041d 100644
--- a/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "4b41fab967fb1c978f573bf0d609a3b12cc3b6ed62bd3108f43f575563
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-six \
         python3-gevent \
         python3-requests \
diff --git a/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb b/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb
index cc2824c..c48e1ef 100644
--- a/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb
@@ -21,8 +21,8 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
+# RDEPENDS:default:
+RDEPENDS:${PN} += " \
         python3-pbr \
         python3-stevedore \
         python3-six \
diff --git a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
index acba23e..8df1948 100644
--- a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
@@ -18,5 +18,5 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb b/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb
index ca8c069..b11c3d8 100644
--- a/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb
@@ -13,6 +13,6 @@ DEPENDS += " \
         python3-pbr \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-vine_5.0.0.bb b/meta-openstack/recipes-devtools/python/python3-vine_5.0.0.bb
index 4695402..bea33bc 100644
--- a/meta-openstack/recipes-devtools/python/python3-vine_5.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-vine_5.0.0.bb
@@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-voluptuous_0.12.0.bb b/meta-openstack/recipes-devtools/python/python3-voluptuous_0.12.0.bb
index 5c59c21..3e77e30 100644
--- a/meta-openstack/recipes-devtools/python/python3-voluptuous_0.12.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-voluptuous_0.12.0.bb
@@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "3a4ef294e16f6950c79de4cba88f31092a107e6e3aaa29950b43e2bb9e
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
index b4f4874..6c09b94 100644
--- a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9
 
 inherit pypi setuptools3
 
-RDEPENDS_${PN} += "${PYTHON_PN}-jsonschema \
+RDEPENDS:${PN} += "${PYTHON_PN}-jsonschema \
                    ${PYTHON_PN}-jsonpatch  \
                   "
 
diff --git a/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
index 436ee3d..40b694e 100644
--- a/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "c35b5b79ebc517d3b784dacfb993be413a93cda5222c6f382443ce29c1
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += "gmp"
+RDEPENDS:${PN} += "gmp"
 
-FILES_${PN} += "${datadir}/*"
+FILES:${PN} += "${datadir}/*"
diff --git a/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb b/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb
index 5fd4f5a..dab1c59 100644
--- a/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb
+++ b/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://README.rst;md5=e3e00192f000e33de99fd5a3cb32a8fc"
 
 PYPI_PACKAGE = "WebTest"
 
-RDEPENDS_${PN} += "${PYTHON_PN}-beautifulsoup4"
+RDEPENDS:${PN} += "${PYTHON_PN}-beautifulsoup4"
 
 SRC_URI[md5sum] = "a5d027ffa0991fdf20e305c62bd37791"
 SRC_URI[sha256sum] = "aac168b5b2b4f200af4e35867cf316712210e3d5db81c1cbdff38722647bb087"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-html \
         python3-logging \
         python3-webob \
diff --git a/meta-openstack/recipes-devtools/python/python3-wsme_0.10.0.bb b/meta-openstack/recipes-devtools/python/python3-wsme_0.10.0.bb
index 57538ec..2f5fa1f 100644
--- a/meta-openstack/recipes-devtools/python/python3-wsme_0.10.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-wsme_0.10.0.bb
@@ -19,7 +19,7 @@ DEPENDS += " \
         ${PYTHON_PN}-pbr-native \
         "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
         ${PYTHON_PN}-pbr \
         ${PYTHON_PN}-six \
         ${PYTHON_PN}-pytz \
diff --git a/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb b/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb
index ea31fc1..521fd71 100644
--- a/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb
@@ -13,6 +13,6 @@ DEPENDS += " \
         python3-cffi-native \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-cffi \
 "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.5.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.5.0.0.bb
index 7d24a67..225ac6d 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.5.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.5.0.0.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb
index 001bde9..d874ca7 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb
index 2fc8f88..cd97fd9 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.4.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.4.1.0.bb
index 670891a..172f4cf 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.4.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.4.1.0.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb
index b50fe20..e7b09ce 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-lrdragndrop_1.0.2.4.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-lrdragndrop_1.0.2.4.bb
index 4946357..10e7bf2 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-lrdragndrop_1.0.2.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-lrdragndrop_1.0.2.4.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-mock_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-mock_1.2.1.1.bb
index 505a637..0de6fba 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-mock_1.2.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-mock_1.2.1.1.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb
index aa49f61..e74acca 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular_1.5.8.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular_1.5.8.0.bb
index c04c4ea..426e776 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular_1.5.8.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular_1.5.8.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.4.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.4.0.0.bb
index 6ecaf8a..3b0a405 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.4.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.4.0.0.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
index 3102979..2094d62 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb
index 52cbe2a..b14a11b 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb
index e5e5491..93b4c1f 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.3.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.3.bb
index 14f6a3d..19d8f7d 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.3.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.2.bb
index 7e1638b..3eebc5a 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.2.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb
index e8bed4c..d63aede 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb
index 98346af..a853f2c 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb
index f367574..8720984 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb
index 6ec6988..314ff37 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_3.4.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_3.4.1.0.bb
index b68654f..788a33a 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_3.4.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_3.4.1.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jsencrypt_2.3.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jsencrypt_2.3.1.1.bb
index 05b3dba..d544dcb 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jsencrypt_2.3.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jsencrypt_2.3.1.1.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-magic-search_0.2.5.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-magic-search_0.2.5.2.bb
index 1bc1457..3e1fbe5 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-magic-search_0.2.5.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-magic-search_0.2.5.2.bb
@@ -14,5 +14,5 @@ inherit setuptools3 pypi
 DEPENDS += " \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-mdi_1.6.50.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-mdi_1.6.50.2.bb
index 3354f47..2a1c20b 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-mdi_1.6.50.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-mdi_1.6.50.2.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-objectpath_1.2.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-objectpath_1.2.1.0.bb
index faf2858..0bb771c 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-objectpath_1.2.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-objectpath_1.2.1.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-qunit_1.14.0.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-qunit_1.14.0.2.bb
index 36ce92b..f054aec 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-qunit_1.14.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-qunit_1.14.0.2.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-rickshaw_1.5.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-rickshaw_1.5.1.0.bb
index d95a982..da94066 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-rickshaw_1.5.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-rickshaw_1.5.1.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb
index a3d6bd0..352ed5e 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         ${PYTHON_PN}-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-smart-table_1.4.13.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-smart-table_1.4.13.2.bb
index bb6895c..9e76a26 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-smart-table_1.4.13.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-smart-table_1.4.13.2.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-spin_1.2.5.3.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-spin_1.2.5.3.bb
index 66bd986..30b0a86 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-spin_1.2.5.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-spin_1.2.5.3.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-term.js_0.0.7.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-term.js_0.0.7.0.bb
index 724fbda..32c4bb0 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-term.js_0.0.7.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-term.js_0.0.7.0.bb
@@ -15,5 +15,5 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-tv4_1.2.7.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-tv4_1.2.7.0.bb
index 73bee88..3e48b25 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-tv4_1.2.7.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-tv4_1.2.7.0.bb
@@ -17,6 +17,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb
index 700bf85..a2ad034 100644
--- a/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb
@@ -13,6 +13,6 @@ DEPENDS += " \
         python3-pip \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         python3-kazoo \
         "
diff --git a/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb b/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb
index 89c3081..55423b7 100644
--- a/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-RDEPENDS_${PN} +=" \
+RDEPENDS:${PN} +=" \
         python3-pbr \
         python3-requests \
         python3-six \