horizon: reorder and update dependencies

Horizon had a rather large set of duplicated DEPENDS, to work around
bitbake evaluation order issues. We can now unify the DEPENDS into
a single list, and leave RDEPENDS to deal with arch specific
differences.

We also add missing horizon juno dependencies.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 17 insertions, 33 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 94b85aa..542e553 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -9,25 +9,31 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} += "python-django \
+RDEPENDS_${PN} += " python-django \
+    python-django-appconf \
     python-django-compressor \
     python-django-nose \
     python-django-openstack-auth \
     python-netaddr \
+    python-ceilometerclient \
     python-cinderclient \
     python-glanceclient \
+    python-heatclient \
     python-keystoneclient \
-    python-nose-exclude \
+    python-troveclient \
+    python-saharaclient \
+    python-lesscpy \
     python-novaclient \
+    python-nose-exclude \
     python-neutronclient \
-    python-heatclient \
     python-pytz \
-    python-django-appconf \
+    python-pbr \
     python-six \
     python-swiftclient \
     python-lockfile \
-    python-pbr \
-    python-troveclient \
+    python-pyyaml \
+    python-xstatic \
+    python-xstatic-jquery \
     python-xstatic-angular \
     python-xstatic-angular-cookies \
     python-xstatic-angular-mock \
@@ -44,9 +50,12 @@ RDEPENDS_${PN} += "python-django \
     python-xstatic-bootstrap-datepicker \
     python-xstatic-bootstrap-scss \
     python-xstatic-font-awesome \
+    python-xstatic-jquery-ui \
+    python-pyscss \
+    python-django-pyscss \
     "
 
-PR = "r2"
+PR = "r3"
 SRCNAME = "horizon"
 
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
@@ -146,32 +155,7 @@ RDEP_ARCH_VAR_i686 = "nodejs"
 RDEP_ARCH_VAR_x86-64 = "nodejs"
 RDEP_ARCH_VAR_ia32 = "nodejs"
 
-RDEPENDS_${PN} += " python-django \
-    python-django-appconf \
-    python-django-compressor \
-    python-django-nose \
-    python-django-openstack-auth \
-    python-netaddr \
-    python-ceilometerclient \
-    python-cinderclient \
-    python-glanceclient \
-    python-heatclient \
-    python-keystoneclient \
-    python-troveclient \
-    python-saharaclient \
-    python-lesscpy \
-    python-novaclient \
-    python-nose-exclude \
-    python-neutronclient \
-    python-pytz \
-    python-six \
-    python-swiftclient \
-    python-lockfile \
-    python-pyyaml \
-    python-xstatic \
-    python-xstatic-jquery \
-    python-pyscss \
-    python-django-pyscss \
+RDEPENDS_${PN} += " \
     ${RDEP_ARCH_VAR} \
     "