--- a/components/python/django/django-PYVER.p5m	Fri May 09 15:56:52 2014 -0700
+++ b/components/python/django/django-PYVER.p5m	Fri May 09 20:59:20 2014 -0700
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
-# The functionality of unittest2 is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python/unittest2-27 -> drop>
 set name=pkg.fmri \
     value=pkg:/library/python/django-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Django Python web framework"
@@ -2384,6 +2384,26 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/django/views/static.py
 license django.license license="BSD, Apache 2.0, MIT, PSFv2"
 
+# force a group dependency on the optional markdown; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/markdown-$(PYV)
+
+# force a group dependency on the optional pytz; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/pytz-$(PYV)
+
+# force a group dependency on the optional setuptools; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/setuptools-$(PYV)
+
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
+# force a group dependency on the optional unittest2; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/unittest2-$(PYV)
+
 # force the rename with an optional dependency on the old name
 depend type=optional \
     fmri=library/python-2/django-$(PYV)@1.4.10,5.12-5.12.0.0.0.44.0
@@ -2391,26 +2411,3 @@
 # force a dependency on the django package
 depend type=require \
     fmri=library/python/django@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force a dependency on ipython; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/ipython-$(PYV)
-
-# force a dependency on markdown; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/markdown-$(PYV)
-
-# force a dependency on python-imaging; pkgdepend work is needed to
-# flush this out.
-depend type=require fmri=library/python/python-imaging-$(PYV)
-
-# force a dependency on python-mysql; pkgdepend work is needed to
-# flush this out.
-depend type=require fmri=library/python/python-mysql-$(PYV)
-
-# force a dependency on pytz; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pytz-$(PYV)
-
-# force a dependency on simplejson; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/simplejson-$(PYV)
-
-# force a dependency on unittest2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/unittest2-$(PYV)