--- a/components/python/formencode/formencode-PYVER.p5m Fri May 09 15:56:52 2014 -0700
+++ b/components/python/formencode/formencode-PYVER.p5m Fri May 09 20:59:20 2014 -0700
@@ -18,6 +18,8 @@
#
# CDDL HEADER END
#
+
+#
# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
@@ -89,6 +91,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/formencode/variabledecode.py
license formencode.license license="PSF, LGPLv2, MIT"
+# force a group dependency on the optional nose; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/nose-$(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 the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/formencode-$(PYV)@1.2.6,5.12-5.12.0.0.0.41.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
@@ -96,7 +110,3 @@
# force a dependency on the formencode package
depend type=require \
fmri=library/python/formencode@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force the rename with an optional dependency on the old name
-depend type=optional \
- fmri=library/python-2/formencode-$(PYV)@1.2.6,5.12-5.12.0.0.0.41.0