PSARC 2014/009 Python pkg(5) name-space update s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 28 Jan 2015 08:53:43 -0800
branchs11-update
changeset 3704 69ab8eca01c5
parent 3698 9c01a3410e89
child 3706 bd45826ad92c
PSARC 2014/009 Python pkg(5) name-space update 18141589 Userland instance of s|/library/python-2/|/library/python/|g
components/fetchmail/resolve.deps
components/lcms/lcms-py26.p5m
components/lcms/lcms-py27.p5m
components/lcms/lcms.p5m
components/lcms/old-manifest-26.p5m
components/lcms/old-manifest-27.p5m
components/libxslt/libxsl-26.p5m
components/libxslt/libxsl-27.p5m
components/libxslt/libxslt.p5m
components/libxslt/old-manifest-26.p5m
components/libxslt/old-manifest-27.p5m
components/logilab-astng/logilab-astng-26.p5m
components/logilab-astng/logilab-astng-27.p5m
components/logilab-astng/logilab-astng.p5m
components/logilab-astng/old-manifest-26.p5m
components/logilab-astng/old-manifest-27.p5m
components/logilab-astng/old-manifest.p5m
components/logilab-common/logilab-common-26.p5m
components/logilab-common/logilab-common-27.p5m
components/logilab-common/logilab-common.p5m
components/logilab-common/old-manifest-26.p5m
components/logilab-common/old-manifest-27.p5m
components/logilab-common/old-manifest.p5m
components/net-snmp/net-snmp-26.p5m
components/net-snmp/net-snmp-27.p5m
components/net-snmp/net-snmp-base.p5m
components/net-snmp/old-manifest-26.p5m
components/net-snmp/old-manifest-27.p5m
components/openscap/old-manifest-26.p5m
components/openscap/openscap-python-26.p5m
components/openscap/openscap.p5m
components/openstack/cinder/cinder.p5m
components/openstack/glance/glance.p5m
components/openstack/heat/heat.p5m
components/openstack/heat/resolve.deps
components/openstack/horizon/horizon.p5m
components/openstack/keystone/keystone.p5m
components/openstack/neutron/neutron.p5m
components/openstack/nova/nova.p5m
components/openstack/nova/resolve.deps
components/openstack/swift/swift.p5m
components/pylint/pylint-26.p5m
components/pylint/pylint-27.p5m
components/python/alembic/alembic-GENFRAG.p5m
components/python/alembic/alembic-PYVER.p5m
components/python/alembic/old-manifest-26.p5m
components/python/alembic/old-manifest-27.p5m
components/python/alembic/old-manifest.p5m
components/python/amqp/amqp-GENFRAG.p5m
components/python/amqp/amqp-PYVER.p5m
components/python/amqp/old-manifest-26.p5m
components/python/amqp/old-manifest-27.p5m
components/python/amqp/old-manifest.p5m
components/python/anyjson/anyjson-GENFRAG.p5m
components/python/anyjson/anyjson-PYVER.p5m
components/python/anyjson/old-manifest-26.p5m
components/python/anyjson/old-manifest-27.p5m
components/python/anyjson/old-manifest.p5m
components/python/argparse/argparse-26.p5m
components/python/argparse/argparse.p5m
components/python/argparse/old-manifest-26.p5m
components/python/argparse/old-manifest.p5m
components/python/babel/babel-GENFRAG.p5m
components/python/babel/babel-PYVER.p5m
components/python/babel/old-manifest-26.p5m
components/python/babel/old-manifest-27.p5m
components/python/babel/old-manifest.p5m
components/python/babel/resolve.deps
components/python/beautifulsoup4/beautifulsoup4-GENFRAG.p5m
components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m
components/python/beautifulsoup4/old-manifest-26.p5m
components/python/beautifulsoup4/old-manifest-27.p5m
components/python/beautifulsoup4/old-manifest.p5m
components/python/beautifulsoup4/resolve.deps
components/python/boto/boto-GENFRAG.p5m
components/python/boto/boto-PYVER.p5m
components/python/boto/old-manifest-26.p5m
components/python/boto/old-manifest-27.p5m
components/python/boto/old-manifest.p5m
components/python/boto/resolve.deps
components/python/ceilometerclient/ceilometerclient-PYVER.p5m
components/python/cheetah/cheetah-GENFRAG.p5m
components/python/cheetah/cheetah-PYVER.p5m
components/python/cheetah/old-manifest-26.p5m
components/python/cheetah/old-manifest-27.p5m
components/python/cheetah/old-manifest.p5m
components/python/cherrypy/cherrypy-GENFRAG.p5m
components/python/cherrypy/cherrypy-PYVER.p5m
components/python/cherrypy/old-manifest-26.p5m
components/python/cherrypy/old-manifest-27.p5m
components/python/cherrypy/old-manifest.p5m
components/python/cinderclient/cinderclient-PYVER.p5m
components/python/cliff/cliff-GENFRAG.p5m
components/python/cliff/cliff-PYVER.p5m
components/python/cliff/old-manifest-26.p5m
components/python/cliff/old-manifest-27.p5m
components/python/cliff/old-manifest.p5m
components/python/cmd2/cmd2-GENFRAG.p5m
components/python/cmd2/cmd2-PYVER.p5m
components/python/cmd2/old-manifest-26.p5m
components/python/cmd2/old-manifest-27.p5m
components/python/cmd2/old-manifest.p5m
components/python/cov-core/cov-core-GENFRAG.p5m
components/python/cov-core/cov-core-PYVER.p5m
components/python/cov-core/old-manifest-26.p5m
components/python/cov-core/old-manifest-27.p5m
components/python/cov-core/old-manifest.p5m
components/python/cov-core/resolve.deps
components/python/coverage/coverage-GENFRAG.p5m
components/python/coverage/coverage-PYVER.p5m
components/python/coverage/old-manifest-26.p5m
components/python/coverage/old-manifest-27.p5m
components/python/coverage/old-manifest.p5m
components/python/coverage/resolve.deps
components/python/cssutils/cssutils-GENFRAG.p5m
components/python/cssutils/cssutils-PYVER.p5m
components/python/cssutils/old-manifest-26.p5m
components/python/cssutils/old-manifest-27.p5m
components/python/cssutils/old-manifest.p5m
components/python/d2to1/d2to1-GENFRAG.p5m
components/python/d2to1/d2to1-PYVER.p5m
components/python/d2to1/old-manifest-26.p5m
components/python/d2to1/old-manifest-27.p5m
components/python/d2to1/old-manifest.p5m
components/python/decorator/decorator-GENFRAG.p5m
components/python/decorator/decorator-PYVER.p5m
components/python/decorator/old-manifest-26.p5m
components/python/decorator/old-manifest-27.p5m
components/python/decorator/old-manifest.p5m
components/python/django-appconf/django-appconf-GENFRAG.p5m
components/python/django-appconf/django-appconf-PYVER.p5m
components/python/django-appconf/old-manifest-26.p5m
components/python/django-appconf/old-manifest-27.p5m
components/python/django-appconf/old-manifest.p5m
components/python/django/django-PYVER.p5m
components/python/django_compressor/django_compressor-GENFRAG.p5m
components/python/django_compressor/django_compressor-PYVER.p5m
components/python/django_compressor/old-manifest-26.p5m
components/python/django_compressor/old-manifest-27.p5m
components/python/django_compressor/old-manifest.p5m
components/python/django_openstack_auth/django_openstack_auth-GENFRAG.p5m
components/python/django_openstack_auth/django_openstack_auth-PYVER.p5m
components/python/django_openstack_auth/old-manifest-26.p5m
components/python/django_openstack_auth/old-manifest-27.p5m
components/python/django_openstack_auth/old-manifest.p5m
components/python/dogpile.cache/dogpile.cache-PYVER.p5m
components/python/eventlet/eventlet-GENFRAG.p5m
components/python/eventlet/eventlet-PYVER.p5m
components/python/eventlet/old-manifest-26.p5m
components/python/eventlet/old-manifest-27.p5m
components/python/eventlet/old-manifest.p5m
components/python/eventlet/resolve.deps
components/python/filechunkio/filechunkio-GENFRAG.p5m
components/python/filechunkio/filechunkio-PYVER.p5m
components/python/filechunkio/old-manifest-26.p5m
components/python/filechunkio/old-manifest-27.p5m
components/python/filechunkio/old-manifest.p5m
components/python/formencode/formencode-GENFRAG.p5m
components/python/formencode/formencode-PYVER.p5m
components/python/formencode/old-manifest-26.p5m
components/python/formencode/old-manifest-27.p5m
components/python/formencode/old-manifest.p5m
components/python/glanceclient/glanceclient-PYVER.p5m
components/python/greenlet/greenlet-GENFRAG.p5m
components/python/greenlet/greenlet-PYVER.p5m
components/python/greenlet/old-manifest-26.p5m
components/python/greenlet/old-manifest-27.p5m
components/python/greenlet/old-manifest.p5m
components/python/heatclient/heatclient-PYVER.p5m
components/python/httplib2/httplib2-GENFRAG.p5m
components/python/httplib2/httplib2-PYVER.p5m
components/python/httplib2/old-manifest-26.p5m
components/python/httplib2/old-manifest-27.p5m
components/python/httplib2/old-manifest.p5m
components/python/imaging/imaging-GENFRAG.p5m
components/python/imaging/imaging-PYVER.p5m
components/python/imaging/old-manifest-26.p5m
components/python/imaging/old-manifest-27.p5m
components/python/imaging/old-manifest.p5m
components/python/importlib/importlib-26.p5m
components/python/importlib/importlib.p5m
components/python/importlib/old-manifest-26.p5m
components/python/importlib/old-manifest.p5m
components/python/ipython/ipython-GENFRAG.p5m
components/python/ipython/ipython-PYVER.p5m
components/python/ipython/old-manifest-26.p5m
components/python/ipython/old-manifest-27.p5m
components/python/ipython/old-manifest.p5m
components/python/ipython/resolve.deps
components/python/jinja2/jinja2-PYVER.p5m
components/python/jsonpatch/jsonpatch-GENFRAG.p5m
components/python/jsonpatch/jsonpatch-PYVER.p5m
components/python/jsonpatch/old-manifest-26.p5m
components/python/jsonpatch/old-manifest-27.p5m
components/python/jsonpatch/old-manifest.p5m
components/python/jsonpointer/jsonpointer-GENFRAG.p5m
components/python/jsonpointer/jsonpointer-PYVER.p5m
components/python/jsonpointer/old-manifest-26.p5m
components/python/jsonpointer/old-manifest-27.p5m
components/python/jsonpointer/old-manifest.p5m
components/python/jsonrpclib/jsonrpclib-26.p5m
components/python/jsonrpclib/jsonrpclib-27.p5m
components/python/jsonrpclib/jsonrpclib.p5m
components/python/jsonrpclib/old-manifest-26.p5m
components/python/jsonrpclib/old-manifest-27.p5m
components/python/jsonrpclib/old-manifest.p5m
components/python/jsonschema/jsonschema-GENFRAG.p5m
components/python/jsonschema/jsonschema-PYVER.p5m
components/python/jsonschema/old-manifest-26.p5m
components/python/jsonschema/old-manifest-27.p5m
components/python/jsonschema/old-manifest.p5m
components/python/keystoneclient/keystoneclient-PYVER.p5m
components/python/kombu/kombu-GENFRAG.p5m
components/python/kombu/kombu-PYVER.p5m
components/python/kombu/old-manifest-26.p5m
components/python/kombu/old-manifest-27.p5m
components/python/kombu/old-manifest.p5m
components/python/lesscpy/lesscpy-GENFRAG.p5m
components/python/lesscpy/lesscpy-PYVER.p5m
components/python/lesscpy/old-manifest-26.p5m
components/python/lesscpy/old-manifest-27.p5m
components/python/lesscpy/old-manifest.p5m
components/python/librabbitmq/librabbitmq-GENFRAG.p5m
components/python/librabbitmq/librabbitmq-PYVER.p5m
components/python/librabbitmq/old-manifest-26.p5m
components/python/librabbitmq/old-manifest-27.p5m
components/python/librabbitmq/old-manifest.p5m
components/python/lockfile/lockfile-GENFRAG.p5m
components/python/lockfile/lockfile-PYVER.p5m
components/python/lockfile/old-manifest-26.p5m
components/python/lockfile/old-manifest-27.p5m
components/python/lockfile/old-manifest.p5m
components/python/m2crypto/m2crypto-GENFRAG.p5m
components/python/m2crypto/m2crypto-PYVER.p5m
components/python/m2crypto/old-manifest-26.p5m
components/python/m2crypto/old-manifest-27.p5m
components/python/m2crypto/old-manifest.p5m
components/python/mako/mako-GENFRAG.p5m
components/python/mako/mako-PYVER.p5m
components/python/mako/old-manifest-26.p5m
components/python/mako/old-manifest-27.p5m
components/python/mako/old-manifest.p5m
components/python/markdown/markdown-GENFRAG.p5m
components/python/markdown/markdown-PYVER.p5m
components/python/markdown/old-manifest-26.p5m
components/python/markdown/old-manifest-27.p5m
components/python/markdown/old-manifest.p5m
components/python/markdown/resolve.deps
components/python/markupsafe/markupsafe-GENFRAG.p5m
components/python/markupsafe/markupsafe-PYVER.p5m
components/python/markupsafe/old-manifest-26.p5m
components/python/markupsafe/old-manifest-27.p5m
components/python/markupsafe/old-manifest.p5m
components/python/mock/mock-GENFRAG.p5m
components/python/mock/mock-PYVER.p5m
components/python/mock/old-manifest-26.p5m
components/python/mock/old-manifest-27.p5m
components/python/mock/old-manifest.p5m
components/python/mysql/mysql-GENFRAG.p5m
components/python/mysql/mysql-PYVER.p5m
components/python/mysql/old-manifest-26.p5m
components/python/mysql/old-manifest-27.p5m
components/python/mysql/old-manifest.p5m
components/python/netaddr/netaddr-GENFRAG.p5m
components/python/netaddr/netaddr-PYVER.p5m
components/python/netaddr/old-manifest-26.p5m
components/python/netaddr/old-manifest-27.p5m
components/python/netaddr/old-manifest.p5m
components/python/netaddr/resolve.deps
components/python/netifaces/netifaces-GENFRAG.p5m
components/python/netifaces/netifaces-PYVER.p5m
components/python/netifaces/old-manifest-26.p5m
components/python/netifaces/old-manifest-27.p5m
components/python/netifaces/old-manifest.p5m
components/python/neutronclient/neutronclient-PYVER.p5m
components/python/nose-cover3/nose-cover3-GENFRAG.p5m
components/python/nose-cover3/nose-cover3-PYVER.p5m
components/python/nose-cover3/old-manifest-26.p5m
components/python/nose-cover3/old-manifest-27.p5m
components/python/nose-cover3/old-manifest.p5m
components/python/nose-cover3/resolve.deps
components/python/nose/nose-GENFRAG.p5m
components/python/nose/nose-PYVER.p5m
components/python/nose/old-manifest-26.p5m
components/python/nose/old-manifest-27.p5m
components/python/nose/old-manifest.p5m
components/python/nose/resolve.deps
components/python/novaclient/novaclient-PYVER.p5m
components/python/ordereddict/old-manifest-26.p5m
components/python/ordereddict/old-manifest.p5m
components/python/ordereddict/ordereddict-26.p5m
components/python/ordereddict/ordereddict.p5m
components/python/oslo.config/oslo.config-PYVER.p5m
components/python/passlib/old-manifest-26.p5m
components/python/passlib/old-manifest-27.p5m
components/python/passlib/old-manifest.p5m
components/python/passlib/passlib-GENFRAG.p5m
components/python/passlib/passlib-PYVER.p5m
components/python/paste.deploy/old-manifest-26.p5m
components/python/paste.deploy/old-manifest-27.p5m
components/python/paste.deploy/old-manifest.p5m
components/python/paste.deploy/paste.deploy-GENFRAG.p5m
components/python/paste.deploy/paste.deploy-PYVER.p5m
components/python/paste/old-manifest-26.p5m
components/python/paste/old-manifest-27.p5m
components/python/paste/old-manifest.p5m
components/python/paste/paste-GENFRAG.p5m
components/python/paste/paste-PYVER.p5m
components/python/paste/resolve.deps
components/python/pbr/pbr-PYVER.p5m
components/python/pbr/resolve.deps
components/python/pep8/old-manifest-26.p5m
components/python/pep8/old-manifest-27.p5m
components/python/pep8/old-manifest.p5m
components/python/pep8/pep8-GENFRAG.p5m
components/python/pep8/pep8-PYVER.p5m
components/python/pep8/resolve.deps
components/python/pip/old-manifest-26.p5m
components/python/pip/old-manifest-27.p5m
components/python/pip/old-manifest.p5m
components/python/pip/pip-GENFRAG.p5m
components/python/pip/pip-PYVER.p5m
components/python/pip/resolve.deps
components/python/ply/old-manifest-26.p5m
components/python/ply/old-manifest-27.p5m
components/python/ply/old-manifest.p5m
components/python/ply/ply-GENFRAG.p5m
components/python/ply/ply-PYVER.p5m
components/python/prettytable/old-manifest-26.p5m
components/python/prettytable/old-manifest-27.p5m
components/python/prettytable/old-manifest.p5m
components/python/prettytable/prettytable-GENFRAG.p5m
components/python/prettytable/prettytable-PYVER.p5m
components/python/py/old-manifest-26.p5m
components/python/py/old-manifest-27.p5m
components/python/py/old-manifest.p5m
components/python/py/py-GENFRAG.p5m
components/python/py/py-PYVER.p5m
components/python/pyasn1-modules/old-manifest-26.p5m
components/python/pyasn1-modules/old-manifest-27.p5m
components/python/pyasn1-modules/old-manifest.p5m
components/python/pyasn1-modules/pyasn1-modules-GENFRAG.p5m
components/python/pyasn1-modules/pyasn1-modules-PYVER.p5m
components/python/pyasn1/old-manifest-26.p5m
components/python/pyasn1/old-manifest-27.p5m
components/python/pyasn1/old-manifest.p5m
components/python/pyasn1/pyasn1-GENFRAG.p5m
components/python/pyasn1/pyasn1-PYVER.p5m
components/python/pybonjour/old-manifest-26.p5m
components/python/pybonjour/old-manifest-27.p5m
components/python/pybonjour/old-manifest.p5m
components/python/pybonjour/pybonjour-GENFRAG.p5m
components/python/pybonjour/pybonjour-PYVER.p5m
components/python/pycountry/old-manifest-26.p5m
components/python/pycountry/old-manifest-27.p5m
components/python/pycountry/old-manifest.p5m
components/python/pycountry/pycountry-GENFRAG.p5m
components/python/pycountry/pycountry-PYVER.p5m
components/python/pycups/old-manifest-26.p5m
components/python/pycups/old-manifest-27.p5m
components/python/pycups/old-manifest.p5m
components/python/pycups/pycups-26.p5m
components/python/pycups/pycups-27.p5m
components/python/pycups/pycups.p5m
components/python/pycurl/old-manifest-26.p5m
components/python/pycurl/old-manifest-27.p5m
components/python/pycurl/old-manifest.p5m
components/python/pycurl/pycurl-GENFRAG.p5m
components/python/pycurl/pycurl-PYVER.p5m
components/python/pydns/old-manifest-26.p5m
components/python/pydns/old-manifest-27.p5m
components/python/pydns/old-manifest.p5m
components/python/pydns/pydns-GENFRAG.p5m
components/python/pydns/pydns-PYVER.p5m
components/python/pyflakes/old-manifest-26.p5m
components/python/pyflakes/old-manifest-27.p5m
components/python/pyflakes/old-manifest.p5m
components/python/pyflakes/pyflakes-GENFRAG.p5m
components/python/pyflakes/pyflakes-PYVER.p5m
components/python/pyflakes/resolve.deps
components/python/pygments/old-manifest-26.p5m
components/python/pygments/old-manifest-27.p5m
components/python/pygments/old-manifest.p5m
components/python/pygments/pygments-GENFRAG.p5m
components/python/pygments/pygments-PYVER.p5m
components/python/pygments/resolve.deps
components/python/pylxml/old-manifest-26.p5m
components/python/pylxml/old-manifest-27.p5m
components/python/pylxml/old-manifest.p5m
components/python/pylxml/pylxml-26.p5m
components/python/pylxml/pylxml-27.p5m
components/python/pylxml/pylxml.p5m
components/python/pyopenssl/old-manifest-26.p5m
components/python/pyopenssl/old-manifest-27.p5m
components/python/pyopenssl/old-manifest.p5m
components/python/pyopenssl/pyopenssl-GENFRAG.p5m
components/python/pyopenssl/pyopenssl-PYVER.p5m
components/python/pyparsing/old-manifest-26.p5m
components/python/pyparsing/old-manifest-27.p5m
components/python/pyparsing/old-manifest.p5m
components/python/pyparsing/pyparsing-GENFRAG.p5m
components/python/pyparsing/pyparsing-PYVER.p5m
components/python/pyrabbit/old-manifest-26.p5m
components/python/pyrabbit/old-manifest-27.p5m
components/python/pyrabbit/old-manifest.p5m
components/python/pyrabbit/pyrabbit-GENFRAG.p5m
components/python/pyrabbit/pyrabbit-PYVER.p5m
components/python/pytest-capturelog/old-manifest-26.p5m
components/python/pytest-capturelog/old-manifest-27.p5m
components/python/pytest-capturelog/old-manifest.p5m
components/python/pytest-capturelog/pytest-capturelog-GENFRAG.p5m
components/python/pytest-capturelog/pytest-capturelog-PYVER.p5m
components/python/pytest-codecheckers/old-manifest-26.p5m
components/python/pytest-codecheckers/old-manifest-27.p5m
components/python/pytest-codecheckers/old-manifest.p5m
components/python/pytest-codecheckers/pytest-codecheckers-GENFRAG.p5m
components/python/pytest-codecheckers/pytest-codecheckers-PYVER.p5m
components/python/pytest-codecheckers/resolve.deps
components/python/pytest-cov/old-manifest-26.p5m
components/python/pytest-cov/old-manifest-27.p5m
components/python/pytest-cov/old-manifest.p5m
components/python/pytest-cov/pytest-cov-GENFRAG.p5m
components/python/pytest-cov/pytest-cov-PYVER.p5m
components/python/pytest-cov/resolve.deps
components/python/pytest/old-manifest-26.p5m
components/python/pytest/old-manifest-27.p5m
components/python/pytest/old-manifest.p5m
components/python/pytest/pytest-GENFRAG.p5m
components/python/pytest/pytest-PYVER.p5m
components/python/pytest/resolve.deps
components/python/python-ldap/old-manifest-26.p5m
components/python/python-ldap/old-manifest-27.p5m
components/python/python-ldap/old-manifest.p5m
components/python/python-ldap/python-ldap-GENFRAG.p5m
components/python/python-ldap/python-ldap-PYVER.p5m
components/python/python-ldap/resolve.deps
components/python/python26/old-manifest-26.p5m
components/python/python26/python-26.p5m
components/python/python26/resolve.deps
components/python/python26/tkinter-26.p5m
components/python/python27/resolve.deps
components/python/pytz/old-manifest-26.p5m
components/python/pytz/old-manifest-27.p5m
components/python/pytz/old-manifest.p5m
components/python/pytz/pytz-GENFRAG.p5m
components/python/pytz/pytz-PYVER.p5m
components/python/quantumclient/quantumclient-PYVER.p5m
components/python/repoze.lru/old-manifest-26.p5m
components/python/repoze.lru/old-manifest-27.p5m
components/python/repoze.lru/old-manifest.p5m
components/python/repoze.lru/repoze.lru-GENFRAG.p5m
components/python/repoze.lru/repoze.lru-PYVER.p5m
components/python/requests/old-manifest-26.p5m
components/python/requests/old-manifest-27.p5m
components/python/requests/old-manifest.p5m
components/python/requests/requests-GENFRAG.p5m
components/python/requests/requests-PYVER.p5m
components/python/routes/old-manifest-26.p5m
components/python/routes/old-manifest-27.p5m
components/python/routes/old-manifest.p5m
components/python/routes/routes-GENFRAG.p5m
components/python/routes/routes-PYVER.p5m
components/python/setuptools-git/old-manifest-26.p5m
components/python/setuptools-git/old-manifest-27.p5m
components/python/setuptools-git/old-manifest.p5m
components/python/setuptools-git/setuptools-git-GENFRAG.p5m
components/python/setuptools-git/setuptools-git-PYVER.p5m
components/python/setuptools/old-manifest-26.p5m
components/python/setuptools/old-manifest-27.p5m
components/python/setuptools/old-manifest.p5m
components/python/setuptools/setuptools-GENFRAG.p5m
components/python/setuptools/setuptools-PYVER.p5m
components/python/simplejson/old-manifest-26.p5m
components/python/simplejson/old-manifest-27.p5m
components/python/simplejson/old-manifest.p5m
components/python/simplejson/simplejson-GENFRAG.p5m
components/python/simplejson/simplejson-PYVER.p5m
components/python/sqlalchemy-migrate/old-manifest-26.p5m
components/python/sqlalchemy-migrate/old-manifest-27.p5m
components/python/sqlalchemy-migrate/old-manifest.p5m
components/python/sqlalchemy-migrate/resolve.deps
components/python/sqlalchemy-migrate/sqlalchemy-migrate-GENFRAG.p5m
components/python/sqlalchemy-migrate/sqlalchemy-migrate-PYVER.p5m
components/python/sqlalchemy/old-manifest-26.p5m
components/python/sqlalchemy/old-manifest-27.p5m
components/python/sqlalchemy/old-manifest.p5m
components/python/sqlalchemy/sqlalchemy-GENFRAG.p5m
components/python/sqlalchemy/sqlalchemy-PYVER.p5m
components/python/stevedore/old-manifest-26.p5m
components/python/stevedore/old-manifest-27.p5m
components/python/stevedore/old-manifest.p5m
components/python/stevedore/stevedore-GENFRAG.p5m
components/python/stevedore/stevedore-PYVER.p5m
components/python/suds/old-manifest-26.p5m
components/python/suds/old-manifest-27.p5m
components/python/suds/old-manifest.p5m
components/python/suds/suds-GENFRAG.p5m
components/python/suds/suds-PYVER.p5m
components/python/swiftclient/swiftclient-PYVER.p5m
components/python/tempita/old-manifest-26.p5m
components/python/tempita/old-manifest-27.p5m
components/python/tempita/old-manifest.p5m
components/python/tempita/tempita-GENFRAG.p5m
components/python/tempita/tempita-PYVER.p5m
components/python/tox/old-manifest-26.p5m
components/python/tox/old-manifest-27.p5m
components/python/tox/old-manifest.p5m
components/python/tox/resolve.deps
components/python/tox/tox-GENFRAG.p5m
components/python/tox/tox-PYVER.p5m
components/python/troveclient/troveclient-PYVER.p5m
components/python/twisted-web2/old-manifest-26.p5m
components/python/twisted-web2/old-manifest-27.p5m
components/python/twisted-web2/old-manifest.p5m
components/python/twisted-web2/twisted-web2-GENFRAG.p5m
components/python/twisted-web2/twisted-web2-PYVER.p5m
components/python/twisted/old-manifest-26.p5m
components/python/twisted/old-manifest-27.p5m
components/python/twisted/old-manifest.p5m
components/python/twisted/twisted-GENFRAG.p5m
components/python/twisted/twisted-PYVER.p5m
components/python/unittest2/old-manifest-26.p5m
components/python/unittest2/old-manifest.p5m
components/python/unittest2/resolve.deps
components/python/unittest2/unittest2-26.p5m
components/python/unittest2/unittest2.p5m
components/python/virtualenv/old-manifest-26.p5m
components/python/virtualenv/old-manifest-27.p5m
components/python/virtualenv/old-manifest.p5m
components/python/virtualenv/resolve.deps
components/python/virtualenv/virtualenv-GENFRAG.p5m
components/python/virtualenv/virtualenv-PYVER.p5m
components/python/waitress/old-manifest-26.p5m
components/python/waitress/old-manifest-27.p5m
components/python/waitress/old-manifest.p5m
components/python/waitress/resolve.deps
components/python/waitress/waitress-GENFRAG.p5m
components/python/waitress/waitress-PYVER.p5m
components/python/warlock/old-manifest-26.p5m
components/python/warlock/old-manifest-27.p5m
components/python/warlock/old-manifest.p5m
components/python/warlock/warlock-GENFRAG.p5m
components/python/warlock/warlock-PYVER.p5m
components/python/webob/old-manifest-26.p5m
components/python/webob/old-manifest-27.p5m
components/python/webob/old-manifest.p5m
components/python/webob/webob-GENFRAG.p5m
components/python/webob/webob-PYVER.p5m
components/python/websockify/resolve.deps
components/python/webtest/old-manifest-26.p5m
components/python/webtest/old-manifest-27.p5m
components/python/webtest/old-manifest.p5m
components/python/webtest/resolve.deps
components/python/webtest/webtest-GENFRAG.p5m
components/python/webtest/webtest-PYVER.p5m
components/python/xattr/resolve.deps
components/python/zope-interface/old-manifest-26.p5m
components/python/zope-interface/old-manifest-27.p5m
components/python/zope-interface/old-manifest.p5m
components/python/zope-interface/zope-interface-GENFRAG.p5m
components/python/zope-interface/zope-interface-PYVER.p5m
components/subversion/old-manifest.p5m
components/subversion/subversion-python.p5m
--- a/components/fetchmail/resolve.deps	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/fetchmail/resolve.deps	Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,5 @@
 library/python-2/tkinter-26
+library/python/tkinter-26
 library/security/openssl
 runtime/python-26
 service/security/kerberos-5
--- a/components/lcms/lcms-py26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/lcms/lcms-py26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,28 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python 2.6 bindings for the Little Color Management System"
-set name=com.oracle.info.description value="the Python 2.6 bindings for the Little Color Management System"
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python 2.6 bindings for the Little Color Management System"
+set name=com.oracle.info.description \
+    value="the Python 2.6 bindings for the Little Color Management System"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/64
 #
 file path=usr/lib/python2.6/vendor-packages/64/_lcms.so
 file path=usr/lib/python2.6/vendor-packages/_lcms.so
@@ -46,6 +47,9 @@
 #
 license lcms.license license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
 # force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
-       pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+    pkg.debug.depend.path=usr/bin
--- a/components/lcms/lcms-py27.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/lcms/lcms-py27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,28 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python 2.7 bindings for the Little Color Management System"
-set name=com.oracle.info.description value="the Python 2.7 bindings for the Little Color Management System"
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python 2.7 bindings for the Little Color Management System"
+set name=com.oracle.info.description \
+    value="the Python 2.7 bindings for the Little Color Management System"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.7
+dir  path=usr/lib/python2.7/vendor-packages
+dir  path=usr/lib/python2.7/vendor-packages/64
 #
 file path=usr/lib/python2.7/vendor-packages/64/_lcms.so
 file path=usr/lib/python2.7/vendor-packages/_lcms.so
@@ -46,6 +47,9 @@
 #
 license lcms.license license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
 # force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
-       pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+    pkg.debug.depend.path=usr/bin
--- a/components/lcms/lcms.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/lcms/lcms.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,25 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The Little Color Management System"
 set name=pkg.description \
     value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
 set name=com.oracle.info.description value="the Little Color Management System"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/lcms
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/lcms
-dir path=usr/share/doc/lcms/html
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
 #
 file path=usr/bin/icc2ps
 file path=usr/bin/icclink
@@ -58,15 +45,32 @@
 file path=usr/bin/tiffdiff
 file path=usr/bin/tifficc
 file path=usr/bin/wtpt
+dir  path=usr/include
+dir  path=usr/include/lcms
 file path=usr/include/lcms/icc34.h
 file path=usr/include/lcms/lcms.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+#
+link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
 file path=usr/lib/$(MACH64)/liblcms.so.1.0.19
 file path=usr/lib/$(MACH64)/llib-llcms.ln
+dir  path=usr/lib/$(MACH64)/pkgconfig
 file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc
+link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
 file path=usr/lib/liblcms.so.1.0.19
 file path=usr/lib/llib-llcms
 file path=usr/lib/llib-llcms.ln
+dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/lcms.pc
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/lcms
+dir  path=usr/share/doc/lcms/html
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/icc2ps.1
 file path=usr/share/man/man1/icclink.1
 file samples/icctrans.1 path=usr/share/man/man1/icctrans.1
@@ -75,16 +79,9 @@
 file path=usr/share/man/man1/wtpt.1
 #
 license lcms.license license=MIT
-#
-link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lcms-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lcms-27
--- a/components/libxslt/libxsl-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/libxslt/libxsl-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,31 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library - Python 2.6 bindings"
-set name=com.oracle.info.description value="Python 2.6 bindings for the XSLT library"
+set name=com.oracle.info.description \
+    value="Python 2.6 bindings for the XSLT library"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2002/244
+set name=org.opensolaris.arc-caseid value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/64
 file path=usr/lib/python2.6/vendor-packages/64/libxsltmod.so
 file path=usr/lib/python2.6/vendor-packages/libxslt.py
 file path=usr/lib/python2.6/vendor-packages/libxsltmod.so
 license xsl.license license=SUNWlxsl-python26.copyright
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/libxslt/libxsl-27.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/libxslt/libxsl-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,31 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library - Python 2.7 bindings"
-set name=com.oracle.info.description value="Python 2.7 bindings for the XSLT library"
+set name=com.oracle.info.description \
+    value="Python 2.7 bindings for the XSLT library"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2002/244
+set name=org.opensolaris.arc-caseid value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.7
+dir  path=usr/lib/python2.7/vendor-packages
+dir  path=usr/lib/python2.7/vendor-packages/64
 file path=usr/lib/python2.7/vendor-packages/64/libxsltmod.so
 file path=usr/lib/python2.7/vendor-packages/libxslt.py
 file path=usr/lib/python2.7/vendor-packages/libxsltmod.so
 license xsl.license license=SUNWlxsl-python26.copyright
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/libxslt/libxslt.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/libxslt/libxslt.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -31,36 +31,18 @@
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2002/244
+set name=org.opensolaris.arc-caseid value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/libexslt
-dir path=usr/include/libxslt
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/aclocal
-dir path=usr/share/lib
-dir path=usr/share/lib/xslt
-dir path=usr/share/lib/xslt/doc
-dir path=usr/share/lib/xslt/doc/html
-dir path=usr/share/lib/xslt/doc/html/EXSLT
-dir path=usr/share/lib/xslt/doc/html/html
-dir path=usr/share/lib/xslt/doc/html/tutorial
-dir path=usr/share/lib/xslt/doc/html/tutorial2
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/xslt-config facet.devel=true
 file path=usr/bin/xsltproc
+dir  path=usr/include
+dir  path=usr/include/libexslt
 file path=usr/include/libexslt/exslt.h
 file path=usr/include/libexslt/exsltconfig.h
 file path=usr/include/libexslt/exsltexports.h
+dir  path=usr/include/libxslt
 file path=usr/include/libxslt/attributes.h
 file path=usr/include/libxslt/documents.h
 file path=usr/include/libxslt/extensions.h
@@ -82,21 +64,35 @@
 file path=usr/include/libxslt/xsltexports.h
 file path=usr/include/libxslt/xsltlocale.h
 file path=usr/include/libxslt/xsltutils.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
 file path=usr/lib/$(MACH64)/libexslt.so.0
+link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
 file path=usr/lib/$(MACH64)/libxslt.so.1
 file path=usr/lib/$(MACH64)/llib-lexslt.ln
 file path=usr/lib/$(MACH64)/llib-lxslt.ln
+dir  path=usr/lib/$(MACH64)/pkgconfig
 file path=usr/lib/$(MACH64)/pkgconfig/libexslt.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libxslt.pc
+link path=usr/lib/libexslt.so target=./libexslt.so.0
 file path=usr/lib/libexslt.so.0
+link path=usr/lib/libxslt.so target=./libxslt.so.1
 file path=usr/lib/libxslt.so.1
 file llib-lexslt path=usr/lib/llib-lexslt
 file path=usr/lib/llib-lexslt.ln
 file llib-lexslt path=usr/lib/llib-lxslt
 file path=usr/lib/llib-lxslt.ln
+dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/libexslt.pc
 file path=usr/lib/pkgconfig/libxslt.pc
+dir  path=usr/share
+dir  path=usr/share/aclocal
 file path=usr/share/aclocal/libxslt.m4
+dir  path=usr/share/lib
+dir  path=usr/share/lib/xslt
+dir  path=usr/share/lib/xslt/doc
+dir  path=usr/share/lib/xslt/doc/html
 file path=usr/share/lib/xslt/doc/html/API.html
 file path=usr/share/lib/xslt/doc/html/APIchunk0.html
 file path=usr/share/lib/xslt/doc/html/APIchunk1.html
@@ -116,6 +112,7 @@
 file path=usr/share/lib/xslt/doc/html/APIfiles.html
 file path=usr/share/lib/xslt/doc/html/APIfunctions.html
 file path=usr/share/lib/xslt/doc/html/APIsymbols.html
+dir  path=usr/share/lib/xslt/doc/html/EXSLT
 file path=usr/share/lib/xslt/doc/html/EXSLT/APIchunk0.html
 file path=usr/share/lib/xslt/doc/html/EXSLT/APIconstructors.html
 file path=usr/share/lib/xslt/doc/html/EXSLT/APIfiles.html
@@ -139,6 +136,7 @@
 file path=usr/share/lib/xslt/doc/html/downloads.html
 file path=usr/share/lib/xslt/doc/html/extensions.html
 file path=usr/share/lib/xslt/doc/html/help.html
+dir  path=usr/share/lib/xslt/doc/html/html
 file path=usr/share/lib/xslt/doc/html/html/book1.html
 file path=usr/share/lib/xslt/doc/html/html/home.png
 file path=usr/share/lib/xslt/doc/html/html/index.html
@@ -177,30 +175,29 @@
 file path=usr/share/lib/xslt/doc/html/smallfootonly.gif
 file path=usr/share/lib/xslt/doc/html/stylesheet.gif
 file path=usr/share/lib/xslt/doc/html/templates.gif
+dir  path=usr/share/lib/xslt/doc/html/tutorial
 file path=usr/share/lib/xslt/doc/html/tutorial/libxslt_tutorial.c
 file path=usr/share/lib/xslt/doc/html/tutorial/libxslttutorial.html
 file path=usr/share/lib/xslt/doc/html/tutorial/libxslttutorial.xml
+dir  path=usr/share/lib/xslt/doc/html/tutorial2
 file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.c
 file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.html
 file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.xml
 file path=usr/share/lib/xslt/doc/html/xslt.html
 file path=usr/share/lib/xslt/doc/html/xsltproc.html
 file path=usr/share/lib/xslt/doc/html/xsltproc2.html
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file xslt-config.1 path=usr/share/man/man1/xslt-config.1 facet.devel=all
 file path=usr/share/man/man1/xsltproc.1
+dir  path=usr/share/man/man3
 file path=usr/share/man/man3/libexslt.3
 file path=usr/share/man/man3/libxslt.3
 legacy pkg=SUNWlxsl desc="The XSLT library" name="The XSLT library"
 license xsl.license license=SUNWlxsl.copyright
-link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
-link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
-link path=usr/lib/libexslt.so target=./libexslt.so.0
-link path=usr/lib/libxslt.so target=./libxslt.so.1
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/libxsl-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/libxsl-27
--- a/components/logilab-astng/logilab-astng-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,44 +18,39 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=pkg.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
-    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=com.oracle.info.description value="the logilab-astng Python 2.6 module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/logilab
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/brain
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/logilab
+dir  path=usr/lib/python2.6/vendor-packages/logilab/astng
 # This file is provided by the logilab-common package
-#file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py \
-#    pkg.tmp.autopyc=false
+#file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py #    pkg.tmp.autopyc=false
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/__init__.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/__pkginfo__.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/as_string.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/bases.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/brain/py2stdlib.py pkg.tmp.autopyc=false
+dir  path=usr/lib/python2.6/vendor-packages/logilab/astng/brain
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/brain/py2stdlib.py \
+    pkg.tmp.autopyc=false
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/builder.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/exceptions.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/inference.py
@@ -69,30 +64,27 @@
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/rebuilder.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/scoped_nodes.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/utils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6-nspkg.pth
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
-
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6-nspkg.pth
+dir  path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
 license logilab-astng.license license=LGPLv2.1,GPLv2
 
-# force a dependency on logilab-common version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
 
 # force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
-       pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+    pkg.debug.depend.path=usr/bin
 
 # force a dependency on the logilab-astng package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-common version 0.58.2
+depend type=require fmri=library/python/[email protected]
--- a/components/logilab-astng/logilab-astng-27.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,57 +18,39 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=pkg.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
-    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=com.oracle.info.description value="the logilab-astng Python 2.7 module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/logilab
-dir path=usr/lib/python2.7/vendor-packages/logilab/astng
-dir path=usr/lib/python2.7/vendor-packages/logilab/astng/brain
-dir path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info
-
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7-nspkg.pth
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.7
+dir  path=usr/lib/python2.7/vendor-packages
+dir  path=usr/lib/python2.7/vendor-packages/logilab
+dir  path=usr/lib/python2.7/vendor-packages/logilab/astng
 # This file is provided by the logilab-common package
 #file path=usr/lib/python2.7/vendor-packages/logilab/__init__.py pkg.tmp.autopyc=false
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/__init__.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/__pkginfo__.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/as_string.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/bases.py
-file path=usr/lib/python2.7/vendor-packages/logilab/astng/brain/py2stdlib.py pkg.tmp.autopyc=false
+dir  path=usr/lib/python2.7/vendor-packages/logilab/astng/brain
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/brain/py2stdlib.py \
+    pkg.tmp.autopyc=false
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/builder.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/exceptions.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/inference.py
@@ -82,16 +64,27 @@
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/rebuilder.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/scoped_nodes.py
 file path=usr/lib/python2.7/vendor-packages/logilab/astng/utils.py
-
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7-nspkg.pth
+dir  path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
 license logilab-astng.license license=LGPLv2.1,GPLv2
 
-# force a dependency on logilab-common version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
 
 # force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
-       pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+    pkg.debug.depend.path=usr/bin
 
 # force a dependency on the logilab-astng package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-common version 0.58.2
+depend type=require fmri=library/python/[email protected]
--- a/components/logilab-astng/logilab-astng.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,36 +18,37 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=pkg.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
-    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=com.oracle.info.description value="the logilab-astng Python module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man3
 file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
 license logilab-astng.license license=LGPLv2.1,GPLv2
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
 
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-astng-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-astng-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-astng
--- a/components/logilab-common/logilab-common-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-common/logilab-common-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,25 +18,25 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="common python libraries for logilab applications"
 set name=pkg.description \
     value="Modules providing low level functionality shared among various python projects."
-set name=pkg.summary value="common python libraries for logilab applications"
-set name=com.oracle.info.description value="the logilab-common Python 2.6 module"
+set name=com.oracle.info.description \
+    value="the logilab-common Python 2.6 module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/298
+set name=org.opensolaris.arc-caseid value=LSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+link path=usr/bin/pytest target=pytest-2.6 mediator=python mediator-version=2.6
 file path=usr/bin/pytest-2.6
 file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/__init__.py
@@ -76,52 +76,40 @@
 file path=usr/lib/python2.6/vendor-packages/logilab/common/textutils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/tree.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/umessage.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/nodes.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/urllib2ext.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/vcgutils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/visitor.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlrpcutils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlutils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6-nspkg.pth
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6-nspkg.pth
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+license logilab-common.license license=LGPLv2.1,GPLv2
 
-link path=usr/bin/pytest target=pytest-2.6 \
-    mediator=python mediator-version=2.6
 
-license logilab-common.license license=LGPLv2.1,GPLv2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
+# force a dependency on the Python 2.6 runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+    pkg.debug.depend.path=usr/bin
 
 # pkgdepend should have picked up the dependency on /library/python-2/pyorbit-26;
 # this explicit depend action can be removed if pkgdepend is fixed later
-depend fmri=__TBD \
+depend type=require fmri=__TBD \
     pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/CORBA.py \
-    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py \
-    type=require
-
-# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
-       pkg.debug.depend.path=usr/bin type=require
+    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py
 
 # force a dependency on the logilab-common package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/logilab-common/logilab-common-27.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-common/logilab-common-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,37 +18,25 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="common python libraries for logilab applications"
 set name=pkg.description \
     value="Modules providing low level functionality shared among various python projects."
-set name=pkg.summary value="common python libraries for logilab applications"
-set name=com.oracle.info.description value="the logilab-common Python 2.7 module"
+set name=com.oracle.info.description \
+    value="the logilab-common Python 2.7 module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/298
+set name=org.opensolaris.arc-caseid value=LSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7-nspkg.pth
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+link path=usr/bin/pytest target=pytest-2.7 mediator=python mediator-version=2.7
 file path=usr/bin/pytest-2.7
 file path=usr/lib/python2.7/vendor-packages/logilab/__init__.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/__init__.py
@@ -88,39 +76,38 @@
 file path=usr/lib/python2.7/vendor-packages/logilab/common/textutils.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/tree.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/umessage.py
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/__init__.py
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/docbook_writer.py
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/html_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/docbook_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/html_writer.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/nodes.py
-file \
-    path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/text_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/text_writer.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/urllib2ext.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/vcgutils.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/visitor.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/xmlrpcutils.py
 file path=usr/lib/python2.7/vendor-packages/logilab/common/xmlutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7-nspkg.pth
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+license logilab-common.license license=LGPLv2.1,GPLv2
 
-link path=usr/bin/pytest target=pytest-2.7 \
-    mediator=python mediator-version=2.7
 
-license logilab-common.license license=LGPLv2.1,GPLv2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
 
 # This is commented out until there is a 2.7 version available.
-# pkgdepend should have picked up the dependency on 
+# pkgdepend should have picked up the dependency on
 # /library/python-2/pyorbit-27
-#depend fmri=__TBD \
-#    pkg.debug.depend.file=usr/lib/python2.7/vendor-packages/CORBA.py \
-#    pkg.debug.reason=usr/lib/python2.7/vendor-packages/logilab/common/corbautils.py \
-#    type=require
+#depend fmri=__TBD #    pkg.debug.depend.file=usr/lib/python2.7/vendor-packages/CORBA.py #    pkg.debug.reason=usr/lib/python2.7/vendor-packages/logilab/common/corbautils.py #    type=require
 
 # force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
-       pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+    pkg.debug.depend.path=usr/bin
 
 # force a dependency on the logilab-common package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/logilab-common/logilab-common.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-common/logilab-common.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,35 +18,36 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="common python libraries for logilab applications"
 set name=pkg.description \
     value="Modules providing low level functionality shared among various python projects."
-set name=pkg.summary value="common python libraries for logilab applications"
 set name=com.oracle.info.description value="the logilab-common Python module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/298
+set name=org.opensolaris.arc-caseid value=LSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man3
 file logilab-common.3 path=usr/share/man/man3/logilab-common.3
 license logilab-common.license license=LGPLv2.1,GPLv2
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
 
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-common-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-common-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-common
--- a/components/net-snmp/net-snmp-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,38 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Net-SNMP - Python 2.6 bindings"
 set name=com.oracle.info.description value="Python 2.6 bindings for Net-SNMP"
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/355
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.tpno value=$(TPNO)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/netsnmp
-dir path=usr/lib/python2.6/vendor-packages/netsnmp/tests
-dir path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/netsnmp
 file path=usr/lib/python2.6/vendor-packages/netsnmp/__init__.py
 file path=usr/lib/python2.6/vendor-packages/netsnmp/client.py
 file path=usr/lib/python2.6/vendor-packages/netsnmp/client_intf.so
+dir  path=usr/lib/python2.6/vendor-packages/netsnmp/tests
 file path=usr/lib/python2.6/vendor-packages/netsnmp/tests/__init__.py
 file path=usr/lib/python2.6/vendor-packages/netsnmp/tests/test.py
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/top_level.txt
+dir  path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/top_level.txt
 license COPYING license="BSD, BSD-like"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/net-snmp/net-snmp-27.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,38 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Net-SNMP - Python 2.7 bindings"
 set name=com.oracle.info.description value="Python 2.7 bindings for Net-SNMP"
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/355
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.tpno value=$(TPNO)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/netsnmp
-dir path=usr/lib/python2.7/vendor-packages/netsnmp/tests
-dir path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.7
+dir  path=usr/lib/python2.7/vendor-packages
+dir  path=usr/lib/python2.7/vendor-packages/netsnmp
 file path=usr/lib/python2.7/vendor-packages/netsnmp/__init__.py
 file path=usr/lib/python2.7/vendor-packages/netsnmp/client.py
 file path=usr/lib/python2.7/vendor-packages/netsnmp/client_intf.so
+dir  path=usr/lib/python2.7/vendor-packages/netsnmp/tests
 file path=usr/lib/python2.7/vendor-packages/netsnmp/tests/__init__.py
 file path=usr/lib/python2.7/vendor-packages/netsnmp/tests/test.py
-file \
-    path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/top_level.txt
+dir  path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/top_level.txt
 license COPYING license="BSD, BSD-like"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/net-snmp/net-snmp-base.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-base.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,158 +18,181 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-
-set name=pkg.fmri value=pkg:/system/management/snmp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/system/management/snmp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Net-SNMP Agent files and libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.description value="the Net-SNMP agent files and libraries"
-set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
-
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2008/355
+set name=com.oracle.info.description \
+    value="the Net-SNMP agent files and libraries"
 set name=com.oracle.info.tpno value=$(TPNO)
-
-license COPYING license="BSD, BSD-like"
-
-dir path=etc
-dir path=etc/net-snmp
-dir path=etc/net-snmp/snmp
-dir path=etc/net-snmp/snmp/mib2c-data
-dir path=etc/net-snmp/snmp/mibs
-dir path=etc/net-snmp/snmp/snmpconf-data
-dir path=etc/net-snmp/snmp/snmpconf-data/snmp-data
-dir path=etc/net-snmp/snmp/snmpconf-data/snmpd-data
-dir path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/application group=sys
-dir path=lib/svc/manifest/application/management group=sys
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/net-snmp
-dir path=usr/include/net-snmp/agent
-dir path=usr/include/net-snmp/library
-dir path=usr/include/net-snmp/machine
-dir path=usr/include/net-snmp/snmplib
-dir path=usr/include/net-snmp/system
-dir path=usr/include/ucd-snmp
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/net-snmp
-dir path=usr/perl5
-dir path=usr/perl5/$(PERL_VERSION)
-dir path=usr/perl5/$(PERL_VERSION)/man
-dir path=usr/perl5/$(PERL_VERSION)/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent
-dir path=usr/sbin
-dir path=usr/sbin/$(MACH64)
-dir path=usr/sbin/$(MACH32)
-file local/mib2c-conf.d/default-mfd-top.m2c path=etc/net-snmp/snmp/mib2c-data/default-mfd-top.m2c
-file local/mib2c-conf.d/details-enums.m2i path=etc/net-snmp/snmp/mib2c-data/details-enums.m2i
-file local/mib2c-conf.d/details-node.m2i path=etc/net-snmp/snmp/mib2c-data/details-node.m2i
-file local/mib2c-conf.d/details-table.m2i path=etc/net-snmp/snmp/mib2c-data/details-table.m2i
-file local/mib2c-conf.d/generic-ctx-copy.m2i path=etc/net-snmp/snmp/mib2c-data/generic-ctx-copy.m2i
-file local/mib2c-conf.d/generic-ctx-get.m2i path=etc/net-snmp/snmp/mib2c-data/generic-ctx-get.m2i
-file local/mib2c-conf.d/generic-ctx-set.m2i path=etc/net-snmp/snmp/mib2c-data/generic-ctx-set.m2i
-file local/mib2c-conf.d/generic-data-allocate.m2i path=etc/net-snmp/snmp/mib2c-data/generic-data-allocate.m2i
-file local/mib2c-conf.d/generic-data-context.m2i path=etc/net-snmp/snmp/mib2c-data/generic-data-context.m2i
-file local/mib2c-conf.d/generic-get-char.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-char.m2i
-file local/mib2c-conf.d/generic-get-decl-bot.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-decl-bot.m2i
-file local/mib2c-conf.d/generic-get-decl.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-decl.m2i
-file local/mib2c-conf.d/generic-get-long.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-long.m2i
-file local/mib2c-conf.d/generic-get-oid.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-oid.m2i
-file local/mib2c-conf.d/generic-header-bottom.m2i path=etc/net-snmp/snmp/mib2c-data/generic-header-bottom.m2i
-file local/mib2c-conf.d/generic-header-top.m2i path=etc/net-snmp/snmp/mib2c-data/generic-header-top.m2i
-file local/mib2c-conf.d/generic-source-includes.m2i path=etc/net-snmp/snmp/mib2c-data/generic-source-includes.m2i
-file local/mib2c-conf.d/generic-table-constants.m2c path=etc/net-snmp/snmp/mib2c-data/generic-table-constants.m2c
-file local/mib2c-conf.d/generic-table-enums.m2c path=etc/net-snmp/snmp/mib2c-data/generic-table-enums.m2c
-file local/mib2c-conf.d/generic-table-indexes-from-oid.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-from-oid.m2i
-file local/mib2c-conf.d/generic-table-indexes-set.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-set.m2i
-file local/mib2c-conf.d/generic-table-indexes-to-oid.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-to-oid.m2i
-file local/mib2c-conf.d/generic-table-indexes-varbind-setup.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i
-file local/mib2c-conf.d/generic-table-indexes.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes.m2i
-file local/mib2c-conf.d/generic-table-oids.m2c path=etc/net-snmp/snmp/mib2c-data/generic-table-oids.m2c
-file local/mib2c-conf.d/generic-value-map-func.m2i path=etc/net-snmp/snmp/mib2c-data/generic-value-map-func.m2i
-file local/mib2c-conf.d/generic-value-map-reverse.m2i path=etc/net-snmp/snmp/mib2c-data/generic-value-map-reverse.m2i
-file local/mib2c-conf.d/generic-value-map.m2i path=etc/net-snmp/snmp/mib2c-data/generic-value-map.m2i
-file local/mib2c-conf.d/m2c-internal-warning.m2i path=etc/net-snmp/snmp/mib2c-data/m2c-internal-warning.m2i
-file local/mib2c-conf.d/m2c_setup_enum.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_setup_enum.m2i
-file local/mib2c-conf.d/m2c_setup_node.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_setup_node.m2i
-file local/mib2c-conf.d/m2c_setup_table.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_setup_table.m2i
-file local/mib2c-conf.d/m2c_table_save_defaults.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_table_save_defaults.m2i
-file local/mib2c-conf.d/mfd-access-container-cached-defines.m2i path=etc/net-snmp/snmp/mib2c-data/mfd-access-container-cached-defines.m2i
-file local/mib2c-conf.d/mfd-access-unsorted-external-defines.m2i path=etc/net-snmp/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i
-file local/mib2c-conf.d/mfd-data-access.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-data-access.m2c
-file local/mib2c-conf.d/mfd-data-get.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-data-get.m2c
-file local/mib2c-conf.d/mfd-data-set.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-data-set.m2c
-file local/mib2c-conf.d/mfd-doxygen.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-doxygen.m2c
-file local/mib2c-conf.d/mfd-interactive-setup.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-interactive-setup.m2c
-file local/mib2c-conf.d/mfd-interface.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-interface.m2c
-file local/mib2c-conf.d/mfd-makefile.m2m path=etc/net-snmp/snmp/mib2c-data/mfd-makefile.m2m
-file local/mib2c-conf.d/mfd-persistence.m2i path=etc/net-snmp/snmp/mib2c-data/mfd-persistence.m2i
-file local/mib2c-conf.d/mfd-readme.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-readme.m2c
-file local/mib2c-conf.d/mfd-top.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-top.m2c
-file local/mib2c-conf.d/node-get.m2i path=etc/net-snmp/snmp/mib2c-data/node-get.m2i
-file local/mib2c-conf.d/node-set.m2i path=etc/net-snmp/snmp/mib2c-data/node-set.m2i
-file local/mib2c-conf.d/node-storage.m2i path=etc/net-snmp/snmp/mib2c-data/node-storage.m2i
-file local/mib2c-conf.d/node-validate.m2i path=etc/net-snmp/snmp/mib2c-data/node-validate.m2i
-file local/mib2c-conf.d/node-varbind-validate.m2i path=etc/net-snmp/snmp/mib2c-data/node-varbind-validate.m2i
-file local/mib2c-conf.d/parent-dependencies.m2i path=etc/net-snmp/snmp/mib2c-data/parent-dependencies.m2i
-file local/mib2c-conf.d/parent-set.m2i path=etc/net-snmp/snmp/mib2c-data/parent-set.m2i
-file local/mib2c-conf.d/subagent.m2c path=etc/net-snmp/snmp/mib2c-data/subagent.m2c
-file local/mib2c-conf.d/syntax-COUNTER64-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-COUNTER64-get.m2i
-file local/mib2c-conf.d/syntax-DateAndTime-get.m2d path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2d
-file local/mib2c-conf.d/syntax-DateAndTime-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2i
-file local/mib2c-conf.d/syntax-DateAndTime-readme.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-readme.m2i
-file local/mib2c-conf.d/syntax-InetAddress-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-get.m2i
-file local/mib2c-conf.d/syntax-InetAddress-set.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-set.m2i
-file local/mib2c-conf.d/syntax-InetAddressType-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-get.m2i
-file local/mib2c-conf.d/syntax-InetAddressType-set.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-set.m2i
-file local/mib2c-conf.d/syntax-RowStatus-dependencies.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i
-file local/mib2c-conf.d/syntax-RowStatus-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-get.m2i
-file local/mib2c-conf.d/syntax-RowStatus-varbind-validate.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i
-file local/mib2c-conf.d/syntax-StorageType-dependencies.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-StorageType-dependencies.m2i
-file local/mib2c-conf.d/syntax-TestAndIncr-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-TestAndIncr-get.m2i
-file local/mib2c.access_functions.conf path=etc/net-snmp/snmp/mib2c.access_functions.conf
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/355
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir  path=etc
+dir  path=etc/net-snmp
+dir  path=etc/net-snmp/snmp
+dir  path=etc/net-snmp/snmp/mib2c-data
+file local/mib2c-conf.d/default-mfd-top.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/default-mfd-top.m2c
+file local/mib2c-conf.d/details-enums.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/details-enums.m2i
+file local/mib2c-conf.d/details-node.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/details-node.m2i
+file local/mib2c-conf.d/details-table.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/details-table.m2i
+file local/mib2c-conf.d/generic-ctx-copy.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-ctx-copy.m2i
+file local/mib2c-conf.d/generic-ctx-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-ctx-get.m2i
+file local/mib2c-conf.d/generic-ctx-set.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-ctx-set.m2i
+file local/mib2c-conf.d/generic-data-allocate.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-data-allocate.m2i
+file local/mib2c-conf.d/generic-data-context.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-data-context.m2i
+file local/mib2c-conf.d/generic-get-char.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-get-char.m2i
+file local/mib2c-conf.d/generic-get-decl-bot.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-get-decl-bot.m2i
+file local/mib2c-conf.d/generic-get-decl.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-get-decl.m2i
+file local/mib2c-conf.d/generic-get-long.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-get-long.m2i
+file local/mib2c-conf.d/generic-get-oid.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-get-oid.m2i
+file local/mib2c-conf.d/generic-header-bottom.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-header-bottom.m2i
+file local/mib2c-conf.d/generic-header-top.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-header-top.m2i
+file local/mib2c-conf.d/generic-source-includes.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-source-includes.m2i
+file local/mib2c-conf.d/generic-table-constants.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-constants.m2c
+file local/mib2c-conf.d/generic-table-enums.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-enums.m2c
+file local/mib2c-conf.d/generic-table-indexes-from-oid.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-from-oid.m2i
+file local/mib2c-conf.d/generic-table-indexes-set.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-set.m2i
+file local/mib2c-conf.d/generic-table-indexes-to-oid.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-to-oid.m2i
+file local/mib2c-conf.d/generic-table-indexes-varbind-setup.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i
+file local/mib2c-conf.d/generic-table-indexes.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes.m2i
+file local/mib2c-conf.d/generic-table-oids.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/generic-table-oids.m2c
+file local/mib2c-conf.d/generic-value-map-func.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-value-map-func.m2i
+file local/mib2c-conf.d/generic-value-map-reverse.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-value-map-reverse.m2i
+file local/mib2c-conf.d/generic-value-map.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/generic-value-map.m2i
+file local/mib2c-conf.d/m2c-internal-warning.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/m2c-internal-warning.m2i
+file local/mib2c-conf.d/m2c_setup_enum.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/m2c_setup_enum.m2i
+file local/mib2c-conf.d/m2c_setup_node.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/m2c_setup_node.m2i
+file local/mib2c-conf.d/m2c_setup_table.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/m2c_setup_table.m2i
+file local/mib2c-conf.d/m2c_table_save_defaults.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/m2c_table_save_defaults.m2i
+file local/mib2c-conf.d/mfd-access-container-cached-defines.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-access-container-cached-defines.m2i
+file local/mib2c-conf.d/mfd-access-unsorted-external-defines.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i
+file local/mib2c-conf.d/mfd-data-access.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-data-access.m2c
+file local/mib2c-conf.d/mfd-data-get.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-data-get.m2c
+file local/mib2c-conf.d/mfd-data-set.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-data-set.m2c
+file local/mib2c-conf.d/mfd-doxygen.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-doxygen.m2c
+file local/mib2c-conf.d/mfd-interactive-setup.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-interactive-setup.m2c
+file local/mib2c-conf.d/mfd-interface.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-interface.m2c
+file local/mib2c-conf.d/mfd-makefile.m2m \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-makefile.m2m
+file local/mib2c-conf.d/mfd-persistence.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-persistence.m2i
+file local/mib2c-conf.d/mfd-readme.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-readme.m2c
+file local/mib2c-conf.d/mfd-top.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/mfd-top.m2c
+file local/mib2c-conf.d/node-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/node-get.m2i
+file local/mib2c-conf.d/node-set.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/node-set.m2i
+file local/mib2c-conf.d/node-storage.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/node-storage.m2i
+file local/mib2c-conf.d/node-validate.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/node-validate.m2i
+file local/mib2c-conf.d/node-varbind-validate.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/node-varbind-validate.m2i
+file local/mib2c-conf.d/parent-dependencies.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/parent-dependencies.m2i
+file local/mib2c-conf.d/parent-set.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/parent-set.m2i
+file local/mib2c-conf.d/subagent.m2c \
+    path=etc/net-snmp/snmp/mib2c-data/subagent.m2c
+file local/mib2c-conf.d/syntax-COUNTER64-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-COUNTER64-get.m2i
+file local/mib2c-conf.d/syntax-DateAndTime-get.m2d \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2d
+file local/mib2c-conf.d/syntax-DateAndTime-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2i
+file local/mib2c-conf.d/syntax-DateAndTime-readme.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-readme.m2i
+file local/mib2c-conf.d/syntax-InetAddress-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-get.m2i
+file local/mib2c-conf.d/syntax-InetAddress-set.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-set.m2i
+file local/mib2c-conf.d/syntax-InetAddressType-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-get.m2i
+file local/mib2c-conf.d/syntax-InetAddressType-set.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-set.m2i
+file local/mib2c-conf.d/syntax-RowStatus-dependencies.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i
+file local/mib2c-conf.d/syntax-RowStatus-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-get.m2i
+file local/mib2c-conf.d/syntax-RowStatus-varbind-validate.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i
+file local/mib2c-conf.d/syntax-StorageType-dependencies.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-StorageType-dependencies.m2i
+file local/mib2c-conf.d/syntax-TestAndIncr-get.m2i \
+    path=etc/net-snmp/snmp/mib2c-data/syntax-TestAndIncr-get.m2i
+file local/mib2c.access_functions.conf \
+    path=etc/net-snmp/snmp/mib2c.access_functions.conf
 file local/mib2c.array-user.conf path=etc/net-snmp/snmp/mib2c.array-user.conf
-file local/mib2c.check_values.conf path=etc/net-snmp/snmp/mib2c.check_values.conf
-file local/mib2c.check_values_local.conf path=etc/net-snmp/snmp/mib2c.check_values_local.conf
-file local/mib2c.column_defines.conf path=etc/net-snmp/snmp/mib2c.column_defines.conf
-file local/mib2c.column_enums.conf path=etc/net-snmp/snmp/mib2c.column_enums.conf
-file local/mib2c.column_storage.conf path=etc/net-snmp/snmp/mib2c.column_storage.conf
+file local/mib2c.check_values.conf \
+    path=etc/net-snmp/snmp/mib2c.check_values.conf
+file local/mib2c.check_values_local.conf \
+    path=etc/net-snmp/snmp/mib2c.check_values_local.conf
+file local/mib2c.column_defines.conf \
+    path=etc/net-snmp/snmp/mib2c.column_defines.conf
+file local/mib2c.column_enums.conf \
+    path=etc/net-snmp/snmp/mib2c.column_enums.conf
+file local/mib2c.column_storage.conf \
+    path=etc/net-snmp/snmp/mib2c.column_storage.conf
 file local/mib2c.conf path=etc/net-snmp/snmp/mib2c.conf
 file local/mib2c.container.conf path=etc/net-snmp/snmp/mib2c.container.conf
-file local/mib2c.create-dataset.conf path=etc/net-snmp/snmp/mib2c.create-dataset.conf
+file local/mib2c.create-dataset.conf \
+    path=etc/net-snmp/snmp/mib2c.create-dataset.conf
 file local/mib2c.emulation.conf path=etc/net-snmp/snmp/mib2c.emulation.conf
 file local/mib2c.genhtml.conf path=etc/net-snmp/snmp/mib2c.genhtml.conf
 file local/mib2c.int_watch.conf path=etc/net-snmp/snmp/mib2c.int_watch.conf
 file local/mib2c.iterate.conf path=etc/net-snmp/snmp/mib2c.iterate.conf
-file local/mib2c.iterate_access.conf path=etc/net-snmp/snmp/mib2c.iterate_access.conf
+file local/mib2c.iterate_access.conf \
+    path=etc/net-snmp/snmp/mib2c.iterate_access.conf
 file local/mib2c.mfd.conf path=etc/net-snmp/snmp/mib2c.mfd.conf
 file local/mib2c.notify.conf path=etc/net-snmp/snmp/mib2c.notify.conf
 file local/mib2c.old-api.conf path=etc/net-snmp/snmp/mib2c.old-api.conf
@@ -177,72 +200,103 @@
 file local/mib2c.row.conf path=etc/net-snmp/snmp/mib2c.row.conf
 file local/mib2c.scalar.conf path=etc/net-snmp/snmp/mib2c.scalar.conf
 file local/mib2c.table_data.conf path=etc/net-snmp/snmp/mib2c.table_data.conf
-file $(MACH32)/sun/agent/mibs/ENTITY-MIB.txt path=etc/net-snmp/snmp/mibs/ENTITY-MIB.txt
-file $(MACH64)/mibs/LM-SENSORS-MIB.txt path=etc/net-snmp/snmp/mibs/LM-SENSORS-MIB.txt
-file $(MACH64)/mibs/NETWORK-SERVICES-MIB.txt path=etc/net-snmp/snmp/mibs/NETWORK-SERVICES-MIB.txt
-file $(MACH32)/sun/agent/mibs/SUN-MIB.txt path=etc/net-snmp/snmp/mibs/SUN-MIB.txt
-file $(MACH32)/sun/agent/mibs/SUN-SEA-EXTENSIONS-MIB.txt path=etc/net-snmp/snmp/mibs/SUN-SEA-EXTENSIONS-MIB.txt
-file $(MACH32)/sun/agent/mibs/SUN-SEA-PROXY-MIB.txt path=etc/net-snmp/snmp/mibs/SUN-SEA-PROXY-MIB.txt
-file $(MACH32)/sun/agent/mibs/smatrap.mib path=etc/net-snmp/snmp/mibs/smatrap.mib
+dir  path=etc/net-snmp/snmp/mibs
 file mibs/AGENTX-MIB.txt path=etc/net-snmp/snmp/mibs/AGENTX-MIB.txt
 file mibs/DISMAN-EVENT-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-EVENT-MIB.txt
-file mibs/DISMAN-EXPRESSION-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-EXPRESSION-MIB.txt
-file mibs/DISMAN-NSLOOKUP-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-NSLOOKUP-MIB.txt
+file mibs/DISMAN-EXPRESSION-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/DISMAN-EXPRESSION-MIB.txt
+file mibs/DISMAN-NSLOOKUP-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/DISMAN-NSLOOKUP-MIB.txt
 file mibs/DISMAN-PING-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-PING-MIB.txt
-file mibs/DISMAN-SCHEDULE-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-file mibs/DISMAN-SCRIPT-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-file mibs/DISMAN-TRACEROUTE-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-TRACEROUTE-MIB.txt
+file mibs/DISMAN-SCHEDULE-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
+file mibs/DISMAN-SCRIPT-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/DISMAN-SCRIPT-MIB.txt
+file mibs/DISMAN-TRACEROUTE-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/DISMAN-TRACEROUTE-MIB.txt
+file $(MACH32)/sun/agent/mibs/ENTITY-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/ENTITY-MIB.txt
 file mibs/EtherLike-MIB.txt path=etc/net-snmp/snmp/mibs/EtherLike-MIB.txt
 file mibs/HCNUM-TC.txt path=etc/net-snmp/snmp/mibs/HCNUM-TC.txt
-file mibs/HOST-RESOURCES-MIB.txt path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-MIB.txt
-file mibs/HOST-RESOURCES-TYPES.txt path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-TYPES.txt
-file mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt path=etc/net-snmp/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-file mibs/IANA-LANGUAGE-MIB.txt path=etc/net-snmp/snmp/mibs/IANA-LANGUAGE-MIB.txt
+file mibs/HOST-RESOURCES-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-MIB.txt
+file mibs/HOST-RESOURCES-TYPES.txt \
+    path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-TYPES.txt
+file mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
+file mibs/IANA-LANGUAGE-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/IANA-LANGUAGE-MIB.txt
 file mibs/IANA-RTPROTO-MIB.txt path=etc/net-snmp/snmp/mibs/IANA-RTPROTO-MIB.txt
 file mibs/IANAifType-MIB.txt path=etc/net-snmp/snmp/mibs/IANAifType-MIB.txt
-file mibs/IF-INVERTED-STACK-MIB.txt path=etc/net-snmp/snmp/mibs/IF-INVERTED-STACK-MIB.txt
+file mibs/IF-INVERTED-STACK-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/IF-INVERTED-STACK-MIB.txt
 file mibs/IF-MIB.txt path=etc/net-snmp/snmp/mibs/IF-MIB.txt
 file mibs/INET-ADDRESS-MIB.txt path=etc/net-snmp/snmp/mibs/INET-ADDRESS-MIB.txt
 file mibs/IP-FORWARD-MIB.txt path=etc/net-snmp/snmp/mibs/IP-FORWARD-MIB.txt
 file mibs/IP-MIB.txt path=etc/net-snmp/snmp/mibs/IP-MIB.txt
-file mibs/IPV6-FLOW-LABEL-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt
+file mibs/IPV6-FLOW-LABEL-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt
 file mibs/IPV6-ICMP-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-ICMP-MIB.txt
 file mibs/IPV6-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-MIB.txt
 file mibs/IPV6-TC.txt path=etc/net-snmp/snmp/mibs/IPV6-TC.txt
 file mibs/IPV6-TCP-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-TCP-MIB.txt
 file mibs/IPV6-UDP-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-UDP-MIB.txt
+file $(MACH64)/mibs/LM-SENSORS-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/LM-SENSORS-MIB.txt
 file mibs/MTA-MIB.txt path=etc/net-snmp/snmp/mibs/MTA-MIB.txt
-file mibs/NET-SNMP-AGENT-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-AGENT-MIB.txt
-file mibs/NET-SNMP-EXAMPLES-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
-file mibs/NET-SNMP-EXTEND-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-EXTEND-MIB.txt
+file mibs/NET-SNMP-AGENT-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NET-SNMP-AGENT-MIB.txt
+file mibs/NET-SNMP-EXAMPLES-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
+file mibs/NET-SNMP-EXTEND-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NET-SNMP-EXTEND-MIB.txt
 file mibs/NET-SNMP-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-MIB.txt
-file mibs/NET-SNMP-MONITOR-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-MONITOR-MIB.txt
-file mibs/NET-SNMP-SYSTEM-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-SYSTEM-MIB.txt
+file mibs/NET-SNMP-MONITOR-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NET-SNMP-MONITOR-MIB.txt
+file mibs/NET-SNMP-SYSTEM-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NET-SNMP-SYSTEM-MIB.txt
 file mibs/NET-SNMP-TC.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-TC.txt
-file mibs/NET-SNMP-VACM-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-VACM-MIB.txt
-file mibs/NOTIFICATION-LOG-MIB.txt path=etc/net-snmp/snmp/mibs/NOTIFICATION-LOG-MIB.txt
+file mibs/NET-SNMP-VACM-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NET-SNMP-VACM-MIB.txt
+file $(MACH64)/mibs/NETWORK-SERVICES-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NETWORK-SERVICES-MIB.txt
+file mibs/NOTIFICATION-LOG-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/NOTIFICATION-LOG-MIB.txt
 file mibs/RFC-1215.txt path=etc/net-snmp/snmp/mibs/RFC-1215.txt
 file mibs/RFC1155-SMI.txt path=etc/net-snmp/snmp/mibs/RFC1155-SMI.txt
 file mibs/RFC1213-MIB.txt path=etc/net-snmp/snmp/mibs/RFC1213-MIB.txt
 file mibs/RMON-MIB.txt path=etc/net-snmp/snmp/mibs/RMON-MIB.txt
 file mibs/SMUX-MIB.txt path=etc/net-snmp/snmp/mibs/SMUX-MIB.txt
-file mibs/SNMP-COMMUNITY-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-file mibs/SNMP-FRAMEWORK-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
+file mibs/SNMP-COMMUNITY-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SNMP-COMMUNITY-MIB.txt
+file mibs/SNMP-FRAMEWORK-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 file mibs/SNMP-MPD-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-MPD-MIB.txt
-file mibs/SNMP-NOTIFICATION-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
+file mibs/SNMP-NOTIFICATION-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 file mibs/SNMP-PROXY-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-PROXY-MIB.txt
 file mibs/SNMP-TARGET-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-TARGET-MIB.txt
-file mibs/SNMP-USER-BASED-SM-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
+file mibs/SNMP-USER-BASED-SM-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 file mibs/SNMP-USM-AES-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-USM-AES-MIB.txt
-file mibs/SNMP-USM-DH-OBJECTS-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
-file mibs/SNMP-VIEW-BASED-ACM-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
+file mibs/SNMP-USM-DH-OBJECTS-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
+file mibs/SNMP-VIEW-BASED-ACM-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
 file mibs/SNMPv2-CONF.txt path=etc/net-snmp/snmp/mibs/SNMPv2-CONF.txt
 file mibs/SNMPv2-MIB.txt path=etc/net-snmp/snmp/mibs/SNMPv2-MIB.txt
 file mibs/SNMPv2-SMI.txt path=etc/net-snmp/snmp/mibs/SNMPv2-SMI.txt
 file mibs/SNMPv2-TC.txt path=etc/net-snmp/snmp/mibs/SNMPv2-TC.txt
 file mibs/SNMPv2-TM.txt path=etc/net-snmp/snmp/mibs/SNMPv2-TM.txt
+file $(MACH32)/sun/agent/mibs/SUN-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SUN-MIB.txt
+file $(MACH32)/sun/agent/mibs/SUN-SEA-EXTENSIONS-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SUN-SEA-EXTENSIONS-MIB.txt
+file $(MACH32)/sun/agent/mibs/SUN-SEA-PROXY-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/SUN-SEA-PROXY-MIB.txt
 file mibs/TCP-MIB.txt path=etc/net-snmp/snmp/mibs/TCP-MIB.txt
-file mibs/TRANSPORT-ADDRESS-MIB.txt path=etc/net-snmp/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt
+file mibs/TRANSPORT-ADDRESS-MIB.txt \
+    path=etc/net-snmp/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt
 file mibs/TUNNEL-MIB.txt path=etc/net-snmp/snmp/mibs/TUNNEL-MIB.txt
 file mibs/UCD-DEMO-MIB.txt path=etc/net-snmp/snmp/mibs/UCD-DEMO-MIB.txt
 file mibs/UCD-DISKIO-MIB.txt path=etc/net-snmp/snmp/mibs/UCD-DISKIO-MIB.txt
@@ -252,36 +306,74 @@
 file mibs/UCD-SNMP-MIB-OLD.txt path=etc/net-snmp/snmp/mibs/UCD-SNMP-MIB-OLD.txt
 file mibs/UCD-SNMP-MIB.txt path=etc/net-snmp/snmp/mibs/UCD-SNMP-MIB.txt
 file mibs/UDP-MIB.txt path=etc/net-snmp/snmp/mibs/UDP-MIB.txt
+file $(MACH32)/sun/agent/mibs/smatrap.mib \
+    path=etc/net-snmp/snmp/mibs/smatrap.mib
 file apps/snmp_perl_trapd.pl path=etc/net-snmp/snmp/snmp_perl_trapd.pl
-file local/snmpconf.dir/snmp-data/authopts path=etc/net-snmp/snmp/snmpconf-data/snmp-data/authopts
-file local/snmpconf.dir/snmp-data/debugging path=etc/net-snmp/snmp/snmpconf-data/snmp-data/debugging
-file local/snmpconf.dir/snmp-data/mibs path=etc/net-snmp/snmp/snmpconf-data/snmp-data/mibs
-file local/snmpconf.dir/snmp-data/output path=etc/net-snmp/snmp/snmpconf-data/snmp-data/output
-file local/snmpconf.dir/snmp-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmp-data/snmpconf-config
-file local/snmpconf.dir/snmpd-data/acl path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/acl
-file local/snmpconf.dir/snmpd-data/basic_setup path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/basic_setup
-file local/snmpconf.dir/snmpd-data/extending path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/extending
-file local/snmpconf.dir/snmpd-data/monitor path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/monitor
-file local/snmpconf.dir/snmpd-data/operation path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/operation
-file local/snmpconf.dir/snmpd-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/snmpconf-config
-file local/snmpconf.dir/snmpd-data/system path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/system
-file local/snmpconf.dir/snmpd-data/trapsinks path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/trapsinks
-file local/snmpconf.dir/snmptrapd-data/authentication path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/authentication
-file local/snmpconf.dir/snmptrapd-data/formatting path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/formatting
-file local/snmpconf.dir/snmptrapd-data/logging path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/logging
-file local/snmpconf.dir/snmptrapd-data/runtime path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/runtime
-file local/snmpconf.dir/snmptrapd-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
-file local/snmpconf.dir/snmptrapd-data/traphandle path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/traphandle
-file $(MACH32)/sun/snmpd.conf path=etc/net-snmp/snmp/snmpd.conf overlay=allow preserve=renamenew
-file net-snmp.xml path=lib/svc/manifest/application/management/net-snmp.xml restart_fmri=svc:/system/manifest-import:default
+dir  path=etc/net-snmp/snmp/snmpconf-data
+dir  path=etc/net-snmp/snmp/snmpconf-data/snmp-data
+file local/snmpconf.dir/snmp-data/authopts \
+    path=etc/net-snmp/snmp/snmpconf-data/snmp-data/authopts
+file local/snmpconf.dir/snmp-data/debugging \
+    path=etc/net-snmp/snmp/snmpconf-data/snmp-data/debugging
+file local/snmpconf.dir/snmp-data/mibs \
+    path=etc/net-snmp/snmp/snmpconf-data/snmp-data/mibs
+file local/snmpconf.dir/snmp-data/output \
+    path=etc/net-snmp/snmp/snmpconf-data/snmp-data/output
+file local/snmpconf.dir/snmp-data/snmpconf-config \
+    path=etc/net-snmp/snmp/snmpconf-data/snmp-data/snmpconf-config
+dir  path=etc/net-snmp/snmp/snmpconf-data/snmpd-data
+file local/snmpconf.dir/snmpd-data/acl \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/acl
+file local/snmpconf.dir/snmpd-data/basic_setup \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/basic_setup
+file local/snmpconf.dir/snmpd-data/extending \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/extending
+file local/snmpconf.dir/snmpd-data/monitor \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/monitor
+file local/snmpconf.dir/snmpd-data/operation \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/operation
+file local/snmpconf.dir/snmpd-data/snmpconf-config \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/snmpconf-config
+file local/snmpconf.dir/snmpd-data/system \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/system
+file local/snmpconf.dir/snmpd-data/trapsinks \
+    path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/trapsinks
+dir  path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data
+file local/snmpconf.dir/snmptrapd-data/authentication \
+    path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/authentication
+file local/snmpconf.dir/snmptrapd-data/formatting \
+    path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/formatting
+file local/snmpconf.dir/snmptrapd-data/logging \
+    path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/logging
+file local/snmpconf.dir/snmptrapd-data/runtime \
+    path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/runtime
+file local/snmpconf.dir/snmptrapd-data/snmpconf-config \
+    path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
+file local/snmpconf.dir/snmptrapd-data/traphandle \
+    path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/traphandle
+file $(MACH32)/sun/snmpd.conf path=etc/net-snmp/snmp/snmpd.conf overlay=allow \
+    preserve=renamenew
+dir  path=lib
+dir  path=lib/svc
+dir  path=lib/svc/manifest group=sys
+dir  path=lib/svc/manifest/application group=sys
+dir  path=lib/svc/manifest/application/management group=sys
+file net-snmp.xml path=lib/svc/manifest/application/management/net-snmp.xml \
+    restart_fmri=svc:/system/manifest-import:default
+dir  path=lib/svc/method
 file svc-net-snmp path=lib/svc/method/svc-net-snmp
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/encode_keychange
 file path=usr/bin/fixproc
 file path=usr/bin/ipf-mod.pl
 file path=usr/bin/mib2c
 file path=usr/bin/mib2c-update
+link path=usr/bin/net-snmp-config target=./net-snmp-config-32 variant.arch=i386
+link path=usr/bin/net-snmp-config target=./net-snmp-config-64 variant.arch=sparc
 file usr/bin/net-snmp-config path=usr/bin/net-snmp-config-32
-file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-config path=usr/bin/net-snmp-config-64
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-config \
+    path=usr/bin/net-snmp-config-64
 file path=usr/bin/snmpbulkget
 file path=usr/bin/snmpbulkwalk
 file path=usr/bin/snmpcheck
@@ -290,6 +382,7 @@
 file path=usr/bin/snmpdf
 file path=usr/bin/snmpget
 file path=usr/bin/snmpgetnext
+link path=usr/bin/snmpinform target=snmptrap
 file path=usr/bin/snmpnetstat
 file path=usr/bin/snmpset
 file path=usr/bin/snmpstatus
@@ -302,6 +395,9 @@
 file path=usr/bin/snmpwalk
 file path=usr/bin/tkmib
 file path=usr/bin/traptoemail
+dir  path=usr/include
+dir  path=usr/include/net-snmp
+dir  path=usr/include/net-snmp/agent
 file path=usr/include/net-snmp/agent/agent_callbacks.h
 file path=usr/include/net-snmp/agent/agent_handler.h
 file path=usr/include/net-snmp/agent/agent_index.h
@@ -328,35 +424,37 @@
 file path=usr/include/net-snmp/agent/old_api.h
 file path=usr/include/net-snmp/agent/read_only.h
 file path=usr/include/net-snmp/agent/row_merge.h
+file path=usr/include/net-snmp/agent/scalar.h
 file path=usr/include/net-snmp/agent/scalar_group.h
-file path=usr/include/net-snmp/agent/scalar.h
 file path=usr/include/net-snmp/agent/serialize.h
 file path=usr/include/net-snmp/agent/set_helper.h
 file path=usr/include/net-snmp/agent/snmp_agent.h
 file path=usr/include/net-snmp/agent/snmp_vars.h
 file path=usr/include/net-snmp/agent/stash_cache.h
 file path=usr/include/net-snmp/agent/stash_to_next.h
+file path=usr/include/net-snmp/agent/table.h
 file path=usr/include/net-snmp/agent/table_array.h
 file path=usr/include/net-snmp/agent/table_container.h
 file path=usr/include/net-snmp/agent/table_data.h
 file path=usr/include/net-snmp/agent/table_dataset.h
 file path=usr/include/net-snmp/agent/table_iterator.h
 file path=usr/include/net-snmp/agent/table_tdata.h
-file path=usr/include/net-snmp/agent/table.h
 file path=usr/include/net-snmp/agent/util_funcs.h
 file path=usr/include/net-snmp/agent/var_struct.h
 file path=usr/include/net-snmp/agent/watcher.h
 file path=usr/include/net-snmp/config_api.h
 file path=usr/include/net-snmp/definitions.h
+dir  path=usr/include/net-snmp/library
+file path=usr/include/net-snmp/library/README
 file path=usr/include/net-snmp/library/asn1.h
 file path=usr/include/net-snmp/library/callback.h
 file path=usr/include/net-snmp/library/check_varbind.h
 file path=usr/include/net-snmp/library/cmu_compat.h
+file path=usr/include/net-snmp/library/container.h
 file path=usr/include/net-snmp/library/container_binary_array.h
 file path=usr/include/net-snmp/library/container_iterator.h
 file path=usr/include/net-snmp/library/container_list_ssll.h
 file path=usr/include/net-snmp/library/container_null.h
-file path=usr/include/net-snmp/library/container.h
 file path=usr/include/net-snmp/library/data_list.h
 file path=usr/include/net-snmp/library/default_store.h
 file path=usr/include/net-snmp/library/factory.h
@@ -372,8 +470,15 @@
 file path=usr/include/net-snmp/library/oid_stash.h
 file path=usr/include/net-snmp/library/parse.h
 file path=usr/include/net-snmp/library/read_config.h
-file path=usr/include/net-snmp/library/README
 file path=usr/include/net-snmp/library/scapi.h
+file path=usr/include/net-snmp/library/snmp-tc.h
+file path=usr/include/net-snmp/library/snmp.h
+file path=usr/include/net-snmp/library/snmpCallbackDomain.h
+file path=usr/include/net-snmp/library/snmpTCPDomain.h
+file path=usr/include/net-snmp/library/snmpTCPIPv6Domain.h
+file path=usr/include/net-snmp/library/snmpUDPDomain.h
+file path=usr/include/net-snmp/library/snmpUDPIPv6Domain.h
+file path=usr/include/net-snmp/library/snmpUnixDomain.h
 file path=usr/include/net-snmp/library/snmp_alarm.h
 file path=usr/include/net-snmp/library/snmp_api.h
 file path=usr/include/net-snmp/library/snmp_assert.h
@@ -386,14 +491,6 @@
 file path=usr/include/net-snmp/library/snmp_secmod.h
 file path=usr/include/net-snmp/library/snmp_service.h
 file path=usr/include/net-snmp/library/snmp_transport.h
-file path=usr/include/net-snmp/library/snmp-tc.h
-file path=usr/include/net-snmp/library/snmp.h
-file path=usr/include/net-snmp/library/snmpCallbackDomain.h
-file path=usr/include/net-snmp/library/snmpTCPDomain.h
-file path=usr/include/net-snmp/library/snmpTCPIPv6Domain.h
-file path=usr/include/net-snmp/library/snmpUDPDomain.h
-file path=usr/include/net-snmp/library/snmpUDPIPv6Domain.h
-file path=usr/include/net-snmp/library/snmpUnixDomain.h
 file path=usr/include/net-snmp/library/snmpusm.h
 file path=usr/include/net-snmp/library/snmpv3-security-includes.h
 file path=usr/include/net-snmp/library/snmpv3.h
@@ -405,6 +502,7 @@
 file path=usr/include/net-snmp/library/vacm.h
 file path=usr/include/net-snmp/library/winpipe.h
 file path=usr/include/net-snmp/library/winservice.h
+dir  path=usr/include/net-snmp/machine
 file path=usr/include/net-snmp/machine/generic.h
 file path=usr/include/net-snmp/mib_api.h
 file path=usr/include/net-snmp/net-snmp-config.h
@@ -412,7 +510,9 @@
 file path=usr/include/net-snmp/output_api.h
 file path=usr/include/net-snmp/pdu_api.h
 file path=usr/include/net-snmp/session_api.h
+dir  path=usr/include/net-snmp/snmplib
 file path=usr/include/net-snmp/snmpv3_api.h
+dir  path=usr/include/net-snmp/system
 file path=usr/include/net-snmp/system/aix.h
 file path=usr/include/net-snmp/system/bsd.h
 file path=usr/include/net-snmp/system/bsdi.h
@@ -453,6 +553,7 @@
 file path=usr/include/net-snmp/utilities.h
 file path=usr/include/net-snmp/varbind_api.h
 file path=usr/include/net-snmp/version.h
+dir  path=usr/include/ucd-snmp
 file path=usr/include/ucd-snmp/agent_index.h
 file path=usr/include/ucd-snmp/agent_read_config.h
 file path=usr/include/ucd-snmp/agent_registry.h
@@ -465,12 +566,14 @@
 file path=usr/include/ucd-snmp/header_complex.h
 file path=usr/include/ucd-snmp/int64.h
 file path=usr/include/ucd-snmp/keytools.h
+file path=usr/include/ucd-snmp/mib.h
 file path=usr/include/ucd-snmp/mib_module_config.h
-file path=usr/include/ucd-snmp/mib.h
 file path=usr/include/ucd-snmp/mibincl.h
 file path=usr/include/ucd-snmp/parse.h
 file path=usr/include/ucd-snmp/read_config.h
 file path=usr/include/ucd-snmp/scapi.h
+file path=usr/include/ucd-snmp/snmp-tc.h
+file path=usr/include/ucd-snmp/snmp.h
 file path=usr/include/ucd-snmp/snmp_agent.h
 file path=usr/include/ucd-snmp/snmp_alarm.h
 file path=usr/include/ucd-snmp/snmp_api.h
@@ -480,8 +583,6 @@
 file path=usr/include/ucd-snmp/snmp_logging.h
 file path=usr/include/ucd-snmp/snmp_parse_args.h
 file path=usr/include/ucd-snmp/snmp_vars.h
-file path=usr/include/ucd-snmp/snmp-tc.h
-file path=usr/include/ucd-snmp/snmp.h
 file path=usr/include/ucd-snmp/snmpusm.h
 file path=usr/include/ucd-snmp/snmpv3.h
 file path=usr/include/ucd-snmp/struct.h
@@ -494,97 +595,136 @@
 file path=usr/include/ucd-snmp/util_funcs.h
 file path=usr/include/ucd-snmp/var_struct.h
 file path=usr/include/ucd-snmp/version.h
-file $(MACH64)/sun/agent/modules/entityMib/libentity.so path=usr/lib/$(MACH64)/libentity.so
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmp.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmp.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0
-file $(MACH32)/sun/agent/modules/entityMib/libentity.so path=usr/lib/libentity.so
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+file $(MACH64)/sun/agent/modules/entityMib/libentity.so \
+    path=usr/lib/$(MACH64)/libentity.so
+link path=usr/lib/$(MACH64)/libnetsnmp.so target=./libnetsnmp.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmp.so.15.1.0 \
+    path=usr/lib/$(MACH64)/libnetsnmp.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpagent.so \
+    target=./libnetsnmpagent.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpagent.so.15 \
+    target=./libnetsnmpagent.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0 \
+    path=usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmphelpers.so \
+    target=./libnetsnmphelpers.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15 \
+    target=./libnetsnmphelpers.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0 \
+    path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15 \
+    target=./libnetsnmpmibs.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0 \
+    path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmptrapd.so \
+    target=./libnetsnmptrapd.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15 \
+    target=./libnetsnmptrapd.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0 \
+    path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0
+file $(MACH32)/sun/agent/modules/entityMib/libentity.so \
+    path=usr/lib/libentity.so
+link path=usr/lib/libnetsnmp.so target=./libnetsnmp.so.15.1.0
+link path=usr/lib/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
 file path=usr/lib/libnetsnmp.so.15.1.0
+link path=usr/lib/libnetsnmpagent.so target=./libnetsnmpagent.so.15.1.0
+link path=usr/lib/libnetsnmpagent.so.15 target=./libnetsnmpagent.so.15.1.0
 file path=usr/lib/libnetsnmpagent.so.15.1.0
+link path=usr/lib/libnetsnmphelpers.so target=./libnetsnmphelpers.so.15.1.0
+link path=usr/lib/libnetsnmphelpers.so.15 target=./libnetsnmphelpers.so.15.1.0
 file path=usr/lib/libnetsnmphelpers.so.15.1.0
+link path=usr/lib/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
+link path=usr/lib/libnetsnmpmibs.so.15 target=./libnetsnmpmibs.so.15.1.0
 file path=usr/lib/libnetsnmpmibs.so.15.1.0
+link path=usr/lib/libnetsnmptrapd.so target=./libnetsnmptrapd.so.15.1.0
+link path=usr/lib/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
 file path=usr/lib/libnetsnmptrapd.so.15.1.0
+link path=usr/lib/libsnmp.so target=./libsnmp.so.15.1.0
+link path=usr/lib/libsnmp.so.15 target=./libsnmp.so.15.1.0
 file path=usr/lib/libsnmp.so.15.1.0
+dir  path=usr/lib/net-snmp
 file $(MACH32)/sun/masfcnv path=usr/lib/net-snmp/masfcnv
 file $(MACH32)/sun/masfd path=usr/lib/net-snmp/masfd
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::agent::default_store.3
+dir  path=usr/perl5
+dir  path=usr/perl5/$(PERL_VERSION)
+dir  path=usr/perl5/$(PERL_VERSION)/man
+dir  path=usr/perl5/$(PERL_VERSION)/man/man3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::ASN.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::OID.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::TrapReceiver.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::agent.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::ASN.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::agent::default_store.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::default_store.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::netsnmp_request_infoPtr.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::OID.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::TrapReceiver.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/SNMP.3
+dir  path=usr/perl5/vendor_perl
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle/Makefile.subs.pl
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/ASN.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/OID.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/TrapReceiver.pm
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/Support.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/default_store.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/netsnmp_request_infoPtr.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/default_store.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/SNMP.pm
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP/.packlist
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/autosplit.ix
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/autosplit.ix
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/autosplit.ix
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/autosplit.ix
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/autosplit.ix
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/autosplit.ix
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle/Makefile.subs.pl
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/default_store.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/netsnmp_request_infoPtr.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/Support.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/ASN.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/default_store.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/OID.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/TrapReceiver.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/SNMP.pm
-file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmpd path=usr/sbin/$(MACH64)/snmpd
-file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmptrapd path=usr/sbin/$(MACH64)/snmptrapd
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/autosplit.ix
+dir  path=usr/sbin
+dir  path=usr/sbin/$(MACH32)
 file usr/sbin/snmpd path=usr/sbin/$(MACH32)/snmpd
 file usr/sbin/snmptrapd path=usr/sbin/$(MACH32)/snmptrapd
+dir  path=usr/sbin/$(MACH64)
+file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmpd \
+    path=usr/sbin/$(MACH64)/snmpd
+file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmptrapd \
+    path=usr/sbin/$(MACH64)/snmptrapd
 hardlink path=usr/sbin/snmpd target=../../usr/lib/isaexec
 hardlink path=usr/sbin/snmptrapd target=../../usr/lib/isaexec
-link path=usr/bin/net-snmp-config target=./net-snmp-config-32 variant.arch=i386
-link path=usr/bin/net-snmp-config target=./net-snmp-config-64 variant.arch=sparc
-link path=usr/bin/snmpinform target=snmptrap
-link path=usr/lib/$(MACH64)/libnetsnmp.so target=./libnetsnmp.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpagent.so target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpagent.so.15 target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmphelpers.so target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15 target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15 target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmptrapd.so target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/libnetsnmp.so target=./libnetsnmp.so.15.1.0
-link path=usr/lib/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
-link path=usr/lib/libnetsnmpagent.so target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/libnetsnmpagent.so.15 target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/libnetsnmphelpers.so target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/libnetsnmphelpers.so.15 target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/libnetsnmpmibs.so.15 target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/libnetsnmptrapd.so target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/libsnmp.so target=./libsnmp.so.15.1.0
-link path=usr/lib/libsnmp.so.15 target=./libsnmp.so.15.1.0
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+license COPYING license="BSD, BSD-like"
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/net-snmp/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/net-snmp-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/net-snmp/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/net-snmp-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/openscap-26
--- a/components/openscap/openscap-python-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openscap/openscap-python-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Python 2.6 bindings for the Open implementation of SCAP"
 set name=com.oracle.info.description \
@@ -40,6 +40,10 @@
 file path=usr/lib/python2.6/vendor-packages/openscap_api.py
 license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
 # force a dependency on the Python 2.6 runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
     pkg.debug.depend.path=usr/bin
--- a/components/openscap/openscap.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openscap/openscap.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -2079,5 +2079,5 @@
     fmri=library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/perl-512
 depend type=conditional \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-26
--- a/components/openstack/cinder/cinder.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/cinder/cinder.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.
 #
 
 set name=pkg.fmri \
@@ -431,7 +431,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 dependency on package delivering fcinfo(1M)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/fcinfo
@@ -445,62 +445,62 @@
 # force a dependency on package delivering zfs(1M)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zfs
 
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-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 lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-26
-
-# force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
 # force a dependency on pywbem; pkgdepend work is needed to flush this out.
 # (dependency is for EMC volume driver)
 depend type=require fmri=library/python-2/pywbem
 
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-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 iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-26
 
 # force a dependency on keystoneclient; used via a paste.deploy filter
 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 lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-26
+
 # force a dependency on novaclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/novaclient-26
 
+# force a dependency on paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paste-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
 # 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 routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-26
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-26
 
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-26
+
 # force a dependency on swiftclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/swiftclient-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
--- a/components/openstack/glance/glance.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/glance/glance.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -335,61 +335,61 @@
 
 # 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 swiftclient; pkgdepend work is needed
 # to flush this out.
 depend type=group fmri=library/python/swiftclient-26
 
 # force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-26
+depend type=require fmri=library/python/argparse-26
 
 # force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-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 httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/httplib2-26
-
-# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonschema-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 paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyopenssl-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+depend type=require fmri=library/python/boto-26
 
 # force a dependency on cinderclient; pkgdepend work is needed to flush this
 # out.
 depend type=require fmri=library/python/cinderclient-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 httplib2; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/httplib2-26
+
 # force a dependency on iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-26
 
+# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonschema-26
+
 # force a dependency on keystoneclient; used via a paste.deploy filter
 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 paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paste-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
 # 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 pyopenssl; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyopenssl-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-26
+
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
--- a/components/openstack/heat/heat.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/heat/heat.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -312,7 +312,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-$(PYV)
+depend type=group fmri=library/python/anyjson-$(PYV)
 
 # force a group dependency on the optional ceilometerclient; pkgdepend work is
 # needed to flush this out.
@@ -330,39 +330,14 @@
 # to flush this out.
 depend type=group fmri=library/python/swiftclient-$(PYV)
 
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-$(PYV)
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-$(PYV)
-
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-$(PYV)
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-$(PYV)
-
 # force a dependency on pyyaml; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/pyyaml-$(PYV)
 
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-$(PYV)
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
 
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-$(PYV)
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-$(PYV)
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-$(PYV)
 
 # force a dependency on iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-$(PYV)
@@ -371,11 +346,36 @@
 # out.
 depend type=require fmri=library/python/keystoneclient-$(PYV)
 
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-$(PYV)
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-$(PYV)
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-$(PYV)
+
 # force a dependency on novaclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/novaclient-$(PYV)
 
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-$(PYV)
+
 # force a dependency on pbr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pbr-$(PYV)
 
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-$(PYV)
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-$(PYV)
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-$(PYV)
--- a/components/openstack/heat/resolve.deps	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/heat/resolve.deps	Wed Jan 28 08:53:43 2015 -0800
@@ -1,7 +1,10 @@
 library/python-2/eventlet-26
 library/python-2/setuptools-26
 library/python-2/sqlalchemy-migrate-26
+library/python/eventlet-26
 library/python/oslo.config-26
+library/python/setuptools-26
+library/python/sqlalchemy-migrate-26
 runtime/python-26
 shell/bash
 system/core-os
--- 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
 
--- a/components/openstack/keystone/keystone.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/keystone/keystone.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -391,43 +391,18 @@
 
 # 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 dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-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 lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-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 passlib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/passlib-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+depend type=require fmri=library/python/babel-26
 
 # force a dependency on dogpile.cache; pkgdepend work is needed to flush this
 # out.
 depend type=require fmri=library/python/dogpile.cache-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 iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-26
 
@@ -435,5 +410,30 @@
 # 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 lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-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 passlib; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/passlib-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
--- a/components/openstack/neutron/neutron.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/neutron/neutron.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.
 #
 
 set name=pkg.fmri \
@@ -543,7 +543,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 dependency on package delivering dnsmasq(8)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/inet/dnsmasq
@@ -570,47 +570,19 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/ippool
 
 # force a dependency on alembic; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/alembic-26
+depend type=require fmri=library/python/alembic-26
 
 # force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-26
+depend type=require fmri=library/python/babel-26
 
 # force a dependency on cliff; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cliff-26
+depend type=require fmri=library/python/cliff-26
 
 # force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-26
+depend type=require fmri=library/python/greenlet-26
 
 # force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/httplib2-26
-
-# force a dependency on jsonrpclib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonrpclib-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 mako; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/mako-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+depend type=require fmri=library/python/httplib2-26
 
 # force a dependency on iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-26
@@ -618,18 +590,46 @@
 # force a dependency on jinja2; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/jinja2-26
 
+# force a dependency on jsonrpclib; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonrpclib-26
+
 # force a dependency on keystoneclient; used via a paste.deploy filter
 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 mako; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/mako-26
+
 # force a dependency on neutronclient; pkgdepend work is needed to flush this
 # out.
 depend type=require fmri=library/python/neutronclient-26
 
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
 # 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 requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-26
 
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
+
 # force a dependency on rad-python; pkgdepend work is needed to flush this out
 depend type=require fmri=system/management/rad/client/rad-python
--- a/components/openstack/nova/nova.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/nova/nova.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -783,11 +783,11 @@
 
 # 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 coverage; pkgdepend work is needed to
 # flush this out.
-depend type=group fmri=library/python-2/coverage-26
+depend type=group fmri=library/python/coverage-26
 
 # force a dependency on package delivering archiveadm(1M)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/archiveadm
@@ -808,50 +808,10 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zpool
 
 # force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-26
+depend type=require fmri=library/python/babel-26
 
 # force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-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 jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonschema-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 lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-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 paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on pyasn1; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyasn1-26
-
-# force a dependency on python-ldap; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/python-ldap-26
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-26
+depend type=require fmri=library/python/boto-26
 
 # force a dependency on cinderclient; pkgdepend work is needed to flush this
 # out.
@@ -861,25 +821,65 @@
 # 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 iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-26
 
 # force a dependency on jinja2; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/jinja2-26
 
+# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonschema-26
+
 # force a dependency on keystoneclient; used via a paste.deploy filter
 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 lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-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
 
+# force a dependency on paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paste-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
 # 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 pyasn1; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyasn1-26
+
+# force a dependency on python-ldap; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/python-ldap-26
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-26
 
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-26
+
 # force a dependency on websockify; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/websockify-26
 
--- a/components/openstack/nova/resolve.deps	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/nova/resolve.deps	Wed Jan 28 08:53:43 2015 -0800
@@ -6,6 +6,7 @@
 library/python-2/webob-26
 library/python/eventlet-26
 library/python/oslo.config-26
+library/python/sqlalchemy-26
 library/python/sqlalchemy-migrate-26
 library/python/webob-26
 runtime/python-26
--- a/components/openstack/swift/swift.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/swift/swift.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,10 +20,28 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+#
+<transform file path=.*/(.*_attr)\.d -> set action.hash files/swift.%<1>>
+<transform file path=.*/(.*_attr)\.d -> default group sys>
+<transform file path=etc/swift/(.*) -> set action.hash etc/%<1>-sample>
+<transform file path=etc/swift/rsyncd.conf -> set action.hash files/rsyncd.conf>
+<transform file path=etc/swift/proxy-server.conf -> set action.hash files/proxy-server.conf>
+<transform dir file path=etc/swift/? -> default owner swift>
+<transform dir file path=etc/swift/? -> default group swift>
+<transform file path=etc/swift/ -> default mode 0644>
+<transform file path=etc/swift/ -> default overlay allow>
+<transform file path=etc/swift/ -> default preserve renamenew>
+<transform file path=lib/svc/.*/([^/]*) -> set action.hash files/%<1>>
+<transform hardlink path=lib/svc/method -> default target swift-proxy-server>
+<transform file path=lib/svc/method/swift-proxy-server -> set action.hash files/swift-smf-method>
+<transform file path=usr/lib/swift/(.*) -> set action.hash usr/bin/%<1>>
+<transform file path=usr/lib/swift/(.*) -> default mode 0555>
+<transform file path=usr/share/man/man1/(.+) -> set action.hash doc/manpages/%<1>>
+<transform file path=usr/share/man/man4/(.+)\.4 -> set action.hash doc/manpages/%<1>.5>
 set name=pkg.fmri \
     value=pkg:/cloud/openstack/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="OpenStack Swift (Object Storage Service)"
@@ -43,20 +61,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/050
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-<transform file path=.*/(.*_attr)\.d -> set action.hash files/swift.%<1>>
-<transform file path=.*/(.*_attr)\.d -> default group sys>
 file path=etc/security/auth_attr.d/cloud:openstack:swift
 file path=etc/security/exec_attr.d/cloud:openstack:swift
 file path=etc/security/prof_attr.d/cloud:openstack:swift
-<transform file path=etc/swift/(.*) -> set action.hash etc/%<1>-sample>
-<transform file path=etc/swift/rsyncd.conf -> set action.hash files/rsyncd.conf>
-<transform file path=etc/swift/proxy-server.conf -> set action.hash files/proxy-server.conf>
-<transform dir file path=etc/swift/? -> default owner swift>
-<transform dir file path=etc/swift/? -> default group swift>
-<transform file path=etc/swift/ -> default mode 0644>
-<transform file path=etc/swift/ -> default overlay allow>
-<transform file path=etc/swift/ -> default preserve renamenew>
 dir  path=etc/swift mode=0700
 file path=etc/swift/account-server.conf
 file path=etc/swift/container-server.conf
@@ -69,7 +76,6 @@
 file path=etc/swift/rsyncd.conf
 file path=etc/swift/swift-bench.conf
 file path=etc/swift/swift.conf
-<transform file path=lib/svc/.*/([^/]*) -> set action.hash files/%<1>>
 file path=lib/svc/manifest/application/openstack/swift-account-auditor.xml
 file path=lib/svc/manifest/application/openstack/swift-account-reaper.xml
 file path=lib/svc/manifest/application/openstack/swift-account-replicator.xml
@@ -86,8 +92,6 @@
 file path=lib/svc/manifest/application/openstack/swift-object-updater.xml
 file path=lib/svc/manifest/application/openstack/swift-proxy-server.xml
 file path=lib/svc/manifest/application/openstack/swift-replicator-rsync.xml
-<transform hardlink path=lib/svc/method -> default target swift-proxy-server>
-<transform file path=lib/svc/method/swift-proxy-server -> set action.hash files/swift-smf-method>
 hardlink path=lib/svc/method/swift-account-auditor
 hardlink path=lib/svc/method/swift-account-reaper
 hardlink path=lib/svc/method/swift-account-replicator
@@ -195,8 +199,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/container.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/obj.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/server.py
-<transform file path=usr/lib/swift/(.*) -> set action.hash usr/bin/%<1>>
-<transform file path=usr/lib/swift/(.*) -> default mode 0555>
 file path=usr/lib/swift/swift-account-auditor
 file path=usr/lib/swift/swift-account-reaper
 file path=usr/lib/swift/swift-account-replicator
@@ -214,8 +216,6 @@
 file path=usr/lib/swift/swift-object-updater
 file path=usr/lib/swift/swift-proxy-server
 file path=usr/lib/swift/swift-recon-cron
-<transform file path=usr/share/man/man1/(.+) -> set action.hash doc/manpages/%<1>>
-<transform file path=usr/share/man/man4/(.+)\.4 -> set action.hash doc/manpages/%<1>.5>
 file path=usr/share/man/man1/swift-account-auditor.1
 file path=usr/share/man/man1/swift-account-reaper.1
 file path=usr/share/man/man1/swift-account-replicator.1
@@ -254,19 +254,19 @@
 #
 license LICENSE license="Apache v2.0"
 
-# force a dependency on netifaces; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netifaces-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
 # force a dependency on dnspython; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/dnspython-26
 
 # force a dependency on keystoneclient; used via a paste.deploy filter
 depend type=require fmri=library/python/keystoneclient-26
 
+# force a dependency on netifaces; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netifaces-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
 # force a dependency on pbr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pbr-26
 
--- a/components/pylint/pylint-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/pylint/pylint-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,53 +18,53 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="pylint - python code static checker"
-set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
-set name=com.oracle.info.description value="the pylint Python code static checker for Python 2.6"
+set name=pkg.description \
+    value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description \
+    value="the pylint Python code static checker for Python 2.6"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/325
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/325
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/pylint
-dir \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/pylint/checkers
-dir path=usr/lib/python2.6/vendor-packages/pylint/pyreverse
-dir path=usr/lib/python2.6/vendor-packages/pylint/reporters
-
+dir  path=usr
+dir  path=usr/bin
+link path=usr/bin/epylint target=epylint-2.6 mediator=python \
+    mediator-version=2.6
 file path=usr/bin/epylint-2.6
+link path=usr/bin/pylint target=pylint-2.6 mediator=python mediator-version=2.6
 file path=usr/bin/pylint-2.6
+link path=usr/bin/pylint-gui target=pylint-gui-2.6 mediator=python \
+    mediator-version=2.6
 file path=usr/bin/pylint-gui-2.6
+link path=usr/bin/pyreverse target=pyreverse-2.6 mediator=python \
+    mediator-version=2.6
 file path=usr/bin/pyreverse-2.6
+link path=usr/bin/symilar target=symilar-2.6 mediator=python \
+    mediator-version=2.6
 file path=usr/bin/symilar-2.6
-
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/pylint
+dir  path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
 file path=usr/lib/python2.6/vendor-packages/pylint/__init__.py
 file path=usr/lib/python2.6/vendor-packages/pylint/__pkginfo__.py
+dir  path=usr/lib/python2.6/vendor-packages/pylint/checkers
 file path=usr/lib/python2.6/vendor-packages/pylint/checkers/__init__.py
 file path=usr/lib/python2.6/vendor-packages/pylint/checkers/base.py
 file path=usr/lib/python2.6/vendor-packages/pylint/checkers/classes.py
@@ -86,37 +86,32 @@
 file path=usr/lib/python2.6/vendor-packages/pylint/gui.py
 file path=usr/lib/python2.6/vendor-packages/pylint/interfaces.py
 file path=usr/lib/python2.6/vendor-packages/pylint/lint.py
+dir  path=usr/lib/python2.6/vendor-packages/pylint/pyreverse
 file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/__init__.py
 file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diadefslib.py
 file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diagrams.py
 file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/main.py
 file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/utils.py
 file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/writer.py
+dir  path=usr/lib/python2.6/vendor-packages/pylint/reporters
 file path=usr/lib/python2.6/vendor-packages/pylint/reporters/__init__.py
 file path=usr/lib/python2.6/vendor-packages/pylint/reporters/guireporter.py
 file path=usr/lib/python2.6/vendor-packages/pylint/reporters/html.py
 file path=usr/lib/python2.6/vendor-packages/pylint/reporters/text.py
 file path=usr/lib/python2.6/vendor-packages/pylint/testutils.py
 file path=usr/lib/python2.6/vendor-packages/pylint/utils.py
+license pylint.license license=GPLv2
 
-link path=usr/bin/epylint target=epylint-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/pylint target=pylint-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/pylint-gui target=pylint-gui-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/pyreverse target=pyreverse-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/symilar target=symilar-2.6 mediator=python mediator-version=2.6
+# force a dependency on the Python 2.6 runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+    pkg.debug.depend.path=usr/bin
 
-license pylint.license license="GPLv2"
+# force a dependency on the pylint package
+depend type=require \
+    fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-astng-26 version 0.24.0
+depend type=require fmri=library/python/[email protected]
 
 # force a dependency on logilab-common-26 version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on logilab-astng-26 version 0.24.0
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
-       pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the pylint package
-depend fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
+depend type=require fmri=library/python/[email protected]
--- a/components/pylint/pylint-27.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/pylint/pylint-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,51 +18,53 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="pylint - python code static checker"
-set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
-set name=com.oracle.info.description value="the pylint Python code static checker for Python 2.7"
+set name=pkg.description \
+    value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description \
+    value="the pylint Python code static checker for Python 2.7"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/325
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/325
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/pylint
-dir path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info
-dir path=usr/lib/python2.7/vendor-packages/pylint/checkers
-dir path=usr/lib/python2.7/vendor-packages/pylint/pyreverse
-dir path=usr/lib/python2.7/vendor-packages/pylint/reporters
-
+dir  path=usr
+dir  path=usr/bin
+link path=usr/bin/epylint target=epylint-2.7 mediator=python \
+    mediator-version=2.7
 file path=usr/bin/epylint-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/pylint target=pylint-2.7 mediator=python mediator-version=2.7
 file path=usr/bin/pylint-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/pylint-gui target=pylint-gui-2.7 mediator=python \
+    mediator-version=2.7
 file path=usr/bin/pylint-gui-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/pyreverse target=pyreverse-2.7 mediator=python \
+    mediator-version=2.7
 file path=usr/bin/pyreverse-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/symilar target=symilar-2.7 mediator=python \
+    mediator-version=2.7
 file path=usr/bin/symilar-2.7 pkg.depend.bypass-generate=.*
-file \
-    path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
-file \
-    path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+dir  path=usr/lib
+dir  path=usr/lib/python2.7
+dir  path=usr/lib/python2.7/vendor-packages
+dir  path=usr/lib/python2.7/vendor-packages/pylint
+dir  path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
 file path=usr/lib/python2.7/vendor-packages/pylint/__init__.py
 file path=usr/lib/python2.7/vendor-packages/pylint/__pkginfo__.py
+dir  path=usr/lib/python2.7/vendor-packages/pylint/checkers
 file path=usr/lib/python2.7/vendor-packages/pylint/checkers/__init__.py
 file path=usr/lib/python2.7/vendor-packages/pylint/checkers/base.py
 file path=usr/lib/python2.7/vendor-packages/pylint/checkers/classes.py
@@ -84,37 +86,32 @@
 file path=usr/lib/python2.7/vendor-packages/pylint/gui.py
 file path=usr/lib/python2.7/vendor-packages/pylint/interfaces.py
 file path=usr/lib/python2.7/vendor-packages/pylint/lint.py
+dir  path=usr/lib/python2.7/vendor-packages/pylint/pyreverse
 file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/__init__.py
 file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/diadefslib.py
 file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/diagrams.py
 file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/main.py
 file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/utils.py
 file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/writer.py
+dir  path=usr/lib/python2.7/vendor-packages/pylint/reporters
 file path=usr/lib/python2.7/vendor-packages/pylint/reporters/__init__.py
 file path=usr/lib/python2.7/vendor-packages/pylint/reporters/guireporter.py
 file path=usr/lib/python2.7/vendor-packages/pylint/reporters/html.py
 file path=usr/lib/python2.7/vendor-packages/pylint/reporters/text.py
 file path=usr/lib/python2.7/vendor-packages/pylint/testutils.py
 file path=usr/lib/python2.7/vendor-packages/pylint/utils.py
+license pylint.license license=GPLv2
 
-link path=usr/bin/epylint target=epylint-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pylint target=pylint-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pylint-gui target=pylint-gui-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pyreverse target=pyreverse-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/symilar target=symilar-2.7 mediator=python mediator-version=2.7
+# force a dependency on the Python 2.7 runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+    pkg.debug.depend.path=usr/bin
 
-license pylint.license license="GPLv2"
+# force a dependency on the pylint package
+depend type=require \
+    fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-astng-27 version 0.24.0
+depend type=require fmri=library/python/[email protected]
 
 # force a dependency on logilab-common-27 version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on logilab-astng-27 version 0.24.0
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
-       pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the pylint package
-depend fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
+depend type=require fmri=library/python/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/alembic-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/alembic/alembic-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/alembic/alembic-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/alembic-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/alembic-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A database migration tool for SQLAlchemy."
 set name=pkg.description \
     value="The Python alembic module is a new database migrations tool, offering the following functionality: 1) Can emit ALTER statements to a database in order to change the structure of tables and other constructs. 2) Provides a system whereby 'migration scripts' may be constructed; each script indicates a particular series of steps that can 'upgrade' a target database to a new version, and optionally a series of steps that can 'downgrade' similarly, doing the same steps in reverse. 3) Allows the scripts to execute in some sequential manner."
@@ -76,13 +76,17 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util.py
 license alembic.license license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/alembic-$(PYV)@0.6.0,5.11-0.175.3.0.0.16.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
 
 # force a dependency on the alembic package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
 # force a dependency on mako; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/mako-$(PYV)
+depend type=require fmri=library/python/mako-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/alembic-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/alembic-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/alembic
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/amqp-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/amqp/amqp-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/amqp/amqp-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="AMQP client library for Python"
 set name=pkg.description \
     value="Amqp implements a simple non-threaded Python client library for the Advanced Message Queuing Protocol (AMQP) version 0-8."
@@ -51,10 +51,14 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/transport.py
 license LICENSE license=LGPL2.1
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/amqp-$(PYV)@1.0.12,5.11-0.175.3.0.0.16.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
 
 # force a dependency on the amqp package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/amqp-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/amqp-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/amqp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/anyjson-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/anyjson/anyjson-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/anyjson/anyjson-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/anyjson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/anyjson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Python module wrapping the best available JSON implementation with a common interface"
 set name=pkg.description \
@@ -45,10 +45,14 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/anyjson/__init__.py
 license LICENSE license=BSD
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/anyjson-$(PYV)@0.3.3,5.11-0.175.3.0.0.16.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
 
 # force a dependency on the anyjson package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/anyjson-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/anyjson-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/anyjson
--- a/components/python/argparse/argparse-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/argparse/argparse-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python argparse command-line parsing library"
 set name=pkg.description \
     value="The argparse module makes it easy to write user-friendly command-line interfaces. The program defines what arguments it requires, and argparse will figure out how to parse those out of sys.argv. The argparse module also automatically generates help and usage messages and issues errors when users give the program invalid arguments."
@@ -43,10 +43,14 @@
 file path=usr/lib/python2.6/vendor-packages/argparse.py
 license argparse.license license=PSFv2
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on the argparse package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/argparse/argparse.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/argparse/argparse.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python argparse command-line parsing library"
 set name=pkg.description \
     value="The argparse module makes it easy to write user-friendly command-line interfaces. The program defines what arguments it requires, and argparse will figure out how to parse those out of sys.argv. The argparse module also automatically generates help and usage messages and issues errors when users give the program invalid arguments."
@@ -36,5 +36,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2013/096
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 depend type=conditional \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-26
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/argparse/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/argparse-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/argparse/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/argparse
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/babel-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/babel/babel-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/babel/babel-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/babel-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/babel-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Internationalization Utilities for Python"
 set name=pkg.description \
     value="Babel is a Python library that provides an integrated collection of utilities that assist with internationalizing and localizing Python applications (in particular web-based applications)."
@@ -739,9 +739,13 @@
 #
 license babel.license license=BSD
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/babel-$(PYV)@1.3,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the babel package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
 # force a dependency on pytz; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pytz-$(PYV)
+depend type=require fmri=library/python/pytz-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/babel-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/babel-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/babel
--- a/components/python/babel/resolve.deps	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/babel/resolve.deps	Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
 library/python-2/setuptools-26
 library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
 runtime/python-26
 runtime/python-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/beautifulsoup4-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/beautifulsoup4-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/beautifulsoup4-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Screen-scraping library"
 set name=pkg.description \
     value="Beautiful Soup provides a few simple methods and Pythonic idioms for navigating, searching, and modifying a parse tree: a toolkit for dissecting a document and extracting what you need. It also automatically converts incoming documents to Unicode and outgoing documents to UTF-8. Beautiful Soup sits on top of popular Python parsers like lxml and html5lib, allowing you to try out different parsing strategies or trade speed for flexibility."
@@ -45,13 +45,17 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/bs4/element.py
 license COPYING.txt license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/beautifulsoup4-$(PYV)@4.2.1,5.11-0.175.3.0.0.16.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
 
 # force a dependency on the beautifulsoup4 package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
 # force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
+depend type=require fmri=library/python/lxml-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/beautifulsoup4-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/beautifulsoup4-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/beautifulsoup4
--- a/components/python/beautifulsoup4/resolve.deps	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/beautifulsoup4/resolve.deps	Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
 library/python-2/lxml-26
 library/python-2/lxml-27
+library/python/lxml-26
+library/python/lxml-27
 runtime/python-26
 runtime/python-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/boto-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/boto/boto-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/boto/boto-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/boto-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/boto-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="An Amazon Web Services library for Python"
 set name=pkg.description \
     value="Boto is a Python package that provides interfaces to Amazon Web Services (AWS).  In addition, boto provides support for other public services such as Google Storage in, as well as private cloud systems like Eucalyptus, OpenStack and Nebula."
@@ -433,6 +433,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/boto/vpc/vpngateway.py
 license boto.license license="MIT, Apache v2.0, LGPLv2.1"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/boto-$(PYV)@2.9.9,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the boto package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/boto-26
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest-27.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/boto-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/boto
--- a/components/python/boto/resolve.deps	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/boto/resolve.deps	Wed Jan 28 08:53:43 2015 -0800
@@ -1,5 +1,8 @@
 library/python-2/argparse-26
 library/python-2/filechunkio-26
 library/python-2/filechunkio-27
+library/python/argparse-26
+library/python/filechunkio-26
+library/python/filechunkio-27
 runtime/python-26
 runtime/python-27
--- a/components/python/ceilometerclient/ceilometerclient-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ceilometerclient/ceilometerclient-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
 set name=pkg.fmri \
     value=pkg:/library/python/ceilometerclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
@@ -95,22 +95,13 @@
 
 # force a group dependency on the optional simplejson; pkgdepend work is needed
 # to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
+depend type=group fmri=library/python/simplejson-$(PYV)
 
 # force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
 
 # force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-$(PYV)
+depend type=require fmri=library/python/babel-$(PYV)
 
 # force a dependency on the ceilometerclient package
 depend type=require \
@@ -122,5 +113,14 @@
 # force a dependency on pbr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pbr-$(PYV)
 
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/cheetah-GENFRAG.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cheetah/cheetah-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cheetah/cheetah-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/cheetah-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cheetah-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A template engine and code generation tool"
 set name=pkg.description \
     value="Cheetah is a template engine and code generation too.  It can be used standalone or combined with other tools and frameworks.  At its core, Cheetah is a domain-specific language for markup generation and templating which allows for full integration with existing Python code but also offers extensions to traditional Python syntax to allow for easier text generation.  Web development is its principal use, but Cheetah is very flexible and can be used to geenrate C++ game code, Java, SQL, form emails, and even Python code."
@@ -112,12 +112,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/Cheetah/convertTmplPathToModuleName.py
 license cheetah.license license="MIT, BSD-style, LGPLv2.1"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/cheetah-$(PYV)@2.4.4,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the cheetah package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
 # force a dependency on markdown; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/markdown-$(PYV)
+depend type=require fmri=library/python/markdown-$(PYV)
 
 # force a dependency on pygments; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pygments-$(PYV)
+depend type=require fmri=library/python/pygments-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/c