--- a/components/openstack/horizon/horizon.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/horizon/horizon.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # the static dashboard files need to be written by the webserver, so
@@ -1033,7 +1033,7 @@
 
 # force a group dependency on the optional anyjson; pkgdepend work is needed to
 # flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
 
 # force a group dependency on the optional troveclient; pkgdepend work is needed
 # to flush this out.
@@ -1043,32 +1043,6 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# force a dependency on django_compressor; one of the applications defined in
-# settings.py
-depend type=require fmri=library/python-2/django_compressor-26
-
-# force a dependency on django_openstack_auth; pkgdepend work is needed to flush
-# this out
-depend type=require fmri=library/python-2/django_openstack_auth-26
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/greenlet-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on lesscpy; one of the filters defined in settings.py
-depend type=require fmri=library/python-2/lesscpy-26
-
-# force a dependency on lockfile; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/lockfile-26
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/netaddr-26
-
-# force a dependency on pytz; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/pytz-26
-
 # force a dependency on ceilometerclient; pkgdepend work is needed to flush this
 # out
 depend type=require fmri=library/python/ceilometerclient-26
@@ -1079,9 +1053,20 @@
 # force a dependency on django; pkgdepend work is needed to flush this out
 depend type=require fmri=library/python/django-26
 
+# force a dependency on django_compressor; one of the applications defined in
+# settings.py
+depend type=require fmri=library/python/django_compressor-26
+
+# force a dependency on django_openstack_auth; pkgdepend work is needed to flush
+# this out
+depend type=require fmri=library/python/django_openstack_auth-26
+
 # force a dependency on glanceclient; pkgdepend work is needed to flush this out
 depend type=require fmri=library/python/glanceclient-26
 
+# force a dependency on greenlet; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/greenlet-26
+
 # force a dependency on heatclient; pkgdepend work is needed to flush this out
 depend type=require fmri=library/python/heatclient-26
 
@@ -1092,6 +1077,18 @@
 # out
 depend type=require fmri=library/python/keystoneclient-26
 
+# force a dependency on kombu; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on lesscpy; one of the filters defined in settings.py
+depend type=require fmri=library/python/lesscpy-26
+
+# force a dependency on lockfile; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/lockfile-26
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/netaddr-26
+
 # force a dependency on neutronclient; pkgdepend work is needed to flush this
 # out
 depend type=require fmri=library/python/neutronclient-26
@@ -1102,6 +1099,9 @@
 # force a dependency on pbr; pkgdepend work is needed to flush this out
 depend type=require fmri=library/python/pbr-26
 
+# force a dependency on pytz; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/pytz-26
+
 # force a dependency on six; pkgdepend work is needed to flush this out
 depend type=require fmri=library/python/six-26