PSARC 2014/009 Python pkg(5) name-space update
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 27 Jan 2014 17:48:58 -0800
changeset 1666 69d14d547e77
parent 1665 9e945128be3b
child 1667 dca5c8b075b3
PSARC 2014/009 Python pkg(5) name-space update 18141589 Userland instance of s|/library/python-2/|/library/python/|g
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/libxml2/libxml2-26.p5m
components/libxml2/libxml2-27.p5m
components/libxml2/libxml2.p5m
components/libxml2/old-manifest-26.p5m
components/libxml2/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/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/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/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/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/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/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/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/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/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/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/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/iso8601/iso8601-GENFRAG.p5m
components/python/iso8601/iso8601-PYVER.p5m
components/python/iso8601/old-manifest-26.p5m
components/python/iso8601/old-manifest-27.p5m
components/python/iso8601/old-manifest.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-GENFRAG.p5m
components/python/jsonrpclib/jsonrpclib-PYVER.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/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/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/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/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/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/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/ordereddict/old-manifest-26.p5m
components/python/ordereddict/old-manifest.p5m
components/python/ordereddict/ordereddict-26.p5m
components/python/ordereddict/ordereddict.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/pbr/old-manifest-26.p5m
components/python/pbr/old-manifest-27.p5m
components/python/pbr/old-manifest.p5m
components/python/pbr/pbr-GENFRAG.p5m
components/python/pbr/pbr-PYVER.p5m
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/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/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/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/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-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/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/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/python26/old-manifest-26.p5m
components/python/python26/python-26.p5m
components/python/python26/tkinter-26.p5m
components/python/python27/old-manifest-27.p5m
components/python/python27/python-27.p5m
components/python/python27/tkinter-27.p5m
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/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/six/old-manifest-26.p5m
components/python/six/old-manifest-27.p5m
components/python/six/old-manifest.p5m
components/python/six/six-GENFRAG.p5m
components/python/six/six-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/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/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/tox-GENFRAG.p5m
components/python/tox/tox-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/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/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/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/webtest/old-manifest-26.p5m
components/python/webtest/old-manifest-27.p5m
components/python/webtest/old-manifest.p5m
components/python/webtest/webtest-GENFRAG.p5m
components/python/webtest/webtest-PYVER.p5m
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/lcms/lcms-py26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/lcms/lcms-py26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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="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=9072
@@ -44,3 +44,6 @@
 # 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 the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/lcms/lcms-py27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/lcms/lcms-py27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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="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=9072
@@ -44,3 +44,6 @@
 # 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 the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/lcms/lcms.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/lcms/lcms.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -67,10 +67,10 @@
 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) \
+depend fmri=library/python/[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) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-27 \
     type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/lcms-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/lcms-27 type=require
--- a/components/libxml2/libxml2-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/libxml2/libxml2-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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 XML library - Python 2.6 bindings"
 set name=com.oracle.info.description value="Python 2.6 bindings for the XML library"
 set name=com.oracle.info.tpno value=5302
@@ -38,3 +38,6 @@
 file path=usr/lib/python2.6/vendor-packages/libxml2.py
 file path=usr/lib/python2.6/vendor-packages/libxml2mod.so
 license COPYING license="libxml license"
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/libxml2/libxml2-27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/libxml2/libxml2-27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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 XML library - Python 2.7 bindings"
 set name=com.oracle.info.description value="Python 2.7 bindings for the XML library"
 set name=com.oracle.info.tpno value=5302
@@ -38,3 +38,6 @@
 file path=usr/lib/python2.7/vendor-packages/libxml2.py
 file path=usr/lib/python2.7/vendor-packages/libxml2mod.so
 license COPYING license="libxml license"
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/libxml2/libxml2.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/libxml2/libxml2.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -110,10 +110,10 @@
 link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
 link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
 
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[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) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-27 \
     type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxml2/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/libxml2-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxml2/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/libxml2-27 type=require
--- a/components/libxslt/libxsl-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/libxslt/libxsl-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.tpno value=5303
@@ -37,3 +37,6 @@
 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.12-5.12.0.0.0.41.0
--- a/components/libxslt/libxsl-27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/libxslt/libxsl-27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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.tpno value=5303
@@ -37,3 +37,6 @@
 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.12-5.12.0.0.0.41.0
--- a/components/libxslt/libxslt.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/libxslt/libxslt.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -175,10 +175,10 @@
 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) \
+depend fmri=library/python/[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) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-27 \
     type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/libxsl-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/libxsl-27 type=require
--- a/components/logilab-astng/logilab-astng-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/logilab-astng/logilab-astng-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,13 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
 set name=pkg.summary \
@@ -78,12 +78,16 @@
 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
+depend fmri=library/python/[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 logilab-astng package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     type=require
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/logilab-astng/logilab-astng-27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/logilab-astng/logilab-astng-27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,13 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
 set name=pkg.summary \
@@ -78,12 +78,16 @@
 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
+depend fmri=library/python/[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 logilab-astng package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     type=require
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/logilab-astng/logilab-astng.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/logilab-astng/logilab-astng.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
 set name=pkg.summary \
@@ -40,10 +40,14 @@
 file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
 license logilab-astng.license license=LGPLv2.1,GPLv2
 
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[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) \
+depend fmri=library/python/[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.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/logilab-astng-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/logilab-astng-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/logilab-astng type=require
--- a/components/logilab-common/logilab-common-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/logilab-common/logilab-common-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.description \
     value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
@@ -112,7 +112,7 @@
 
 license logilab-common.license license=LGPLv2.1,GPLv2
 
-# pkgdepend should have picked up the dependency on /library/python-2/pyorbit-26;
+# pkgdepend should have picked up the dependency on /library/python/pyorbit-26;
 # this explicit depend action can be removed if pkgdepend is fixed later
 depend fmri=__TBD \
     pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/CORBA.py \
@@ -124,6 +124,9 @@
        pkg.debug.depend.path=usr/bin type=require
 
 # force a dependency on the logilab-common package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     type=require
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/logilab-common/logilab-common-27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/logilab-common/logilab-common-27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.description \
     value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
@@ -112,7 +112,7 @@
 
 # This is commented out until there is a 2.7 version available.
 # pkgdepend should have picked up the dependency on 
-# /library/python-2/pyorbit-27
+# /library/python/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 \
@@ -123,6 +123,10 @@
        pkg.debug.depend.path=usr/bin type=require
 
 # force a dependency on the logilab-common package
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     type=require
 
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/logilab-common/logilab-common.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/logilab-common/logilab-common.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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.description \
     value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
@@ -39,10 +39,14 @@
 file logilab-common.3 path=usr/share/man/man3/logilab-common.3
 license logilab-common.license license=LGPLv2.1,GPLv2
 
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[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) \
+depend fmri=library/python/[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.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/logilab-common-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/logilab-common-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/logilab-common type=require
--- a/components/net-snmp/net-snmp-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/net-snmp/net-snmp-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -22,7 +22,7 @@
 #
 
 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=13120
@@ -46,3 +46,7 @@
 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.12-5.12.0.0.0.41.0
--- a/components/net-snmp/net-snmp-27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/net-snmp/net-snmp-27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -22,7 +22,7 @@
 #
 
 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=13120
@@ -46,3 +46,7 @@
 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.12-5.12.0.0.0.41.0
--- a/components/net-snmp/net-snmp-base.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/net-snmp/net-snmp-base.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -565,10 +565,10 @@
 link path=usr/lib/libsnmp.so target=./libsnmp.so.30.0.2
 link path=usr/lib/libsnmp.so.30 target=./libsnmp.so.30.0.2
 
-depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/[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) \
+depend fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-27 \
-	    type=conditional
+    type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/net-snmp/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/net-snmp-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/net-snmp/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/net-snmp-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/openscap-26 type=require
--- a/components/openscap/openscap-python-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/openscap/openscap-python-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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 \
@@ -43,3 +43,7 @@
 # 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
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/openscap/openscap.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/openscap/openscap.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -542,5 +542,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/pylint/pylint-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/pylint/pylint-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -96,10 +96,10 @@
 license pylint.license license="GPLv2"
 
 # force a dependency on logilab-common-26 version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
+depend fmri=library/python/[email protected] type=require
 
 # force a dependency on logilab-astng-26 version 0.24.0
-depend fmri=library/python-2/[email protected] type=require
+depend fmri=library/python/[email protected] type=require
 
 # force a dependency on the Python 2.6 runtime
 depend fmri=__TBD pkg.debug.depend.file=python2.6 \
--- a/components/pylint/pylint-27.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/pylint/pylint-27.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -96,10 +96,10 @@
 license pylint.license license="GPLv2"
 
 # force a dependency on logilab-common-27 version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
+depend fmri=library/python/[email protected] type=require
 
 # force a dependency on logilab-astng-27 version 0.24.0
-depend fmri=library/python-2/[email protected] type=require
+depend fmri=library/python/[email protected] type=require
 
 # force a dependency on the Python 2.7 runtime
 depend fmri=__TBD pkg.debug.depend.file=python2.7 \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/alembic-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/python/alembic/alembic-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/alembic/alembic-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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/alembic-$(PYV)@0.6.0,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # 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	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/alembic-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/alembic-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/alembic type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/amqp-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/amqp/amqp-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/amqp/amqp-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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,13 @@
 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.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # 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	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/amqp-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/amqp-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/amqp type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/anyjson-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/anyjson/anyjson-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/anyjson/anyjson-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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,13 @@
 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.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # 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	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/anyjson-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/anyjson-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/anyjson type=require
--- a/components/python/argparse/argparse-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/argparse/argparse-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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.12-5.12.0.0.0.41.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	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/argparse/argparse.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/argparse/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/argparse-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/argparse/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/argparse type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/beautifulsoup4-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,26 @@
+#
+# 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) 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # 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	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/beautifulsoup4-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/beautifulsoup4-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/beautifulsoup4 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/boto-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/boto/boto-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/boto/boto-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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."
@@ -431,6 +431,9 @@
 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.12-5.12.0.0.0.41.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	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/boto-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/boto-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/boto type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/cheetah-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/cheetah/cheetah-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cheetah/cheetah-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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.12-5.12.0.0.0.41.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/cheetah/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cheetah-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cheetah-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cheetah type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/cherrypy-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/cherrypy/cherrypy-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cherrypy/cherrypy-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/cherrypy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cherrypy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
 set name=pkg.description \
     value="CherryPy is a Pythonic, object-oriented HTTP framework.  It includes a fast, HTTP/1.1-compliant, WSGI thread-pooled web server and also allows the use of any other WSGI-enabled web server or adapter including Apache, lighttpd, mod_python, FastCGI, and mod_wsgi. In addition to supporting a flexible plugin system, CherryPy includes built-in tools for caching, encoding, sessions, authorization, and static content."
@@ -84,10 +84,13 @@
 #
 license cherrypy.copyright license=BSD
 
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/cherrypy-$(PYV)@3.1.2,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on the cherrypy 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/cherrypy/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cherrypy-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cherrypy-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cherrypy type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/cliff-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/cliff/cliff-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cliff/cliff-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,14 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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-2/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Command Line Interface Formulation Framework"
 set name=pkg.description \
     value="The Python cliff module is a framework for building command line programs. It uses setuptools entry points to provide subcommands, output formatters, and other extensions."
@@ -62,19 +62,23 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/show.py
 license cliff.license license="Apache v2.0, MIT"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/cliff-$(PYV)@1.4.5,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # 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 the cliff 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 cmd2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cmd2-$(PYV)
+depend type=require fmri=library/python/cmd2-$(PYV)
 
 # force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
+depend type=require fmri=library/python/prettytable-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cliff-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cliff-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cliff type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/cmd2-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/cmd2/cmd2-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cmd2/cmd2-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/cmd2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cmd2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Extra features for Python cmd module"
 set name=pkg.description \
     value="The Python cmd2 module is a drop-in replacement for the standard library's cmd module, and provides numerous enhancements for command-prompt tools."
@@ -43,13 +43,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cmd2.py
 license cmd2.license license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on the cmd2 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 pyparsing; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyparsing-$(PYV)
+depend type=require fmri=library/python/pyparsing-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cmd2-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cmd2-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cmd2 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/cov-core-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/cov-core/cov-core-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cov-core/cov-core-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/cov-core-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cov-core-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="plugin core for use by pytest-cov, nose-cov and nose2-cov"
 set name=pkg.description \
@@ -45,13 +45,17 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cov_core_init.py
 license LICENSE.txt license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/cov-core-$(PYV)@1.7,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on the cov-core 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 coverage; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/coverage-$(PYV)
+depend type=require fmri=library/python/coverage-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cov-core-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cov-core-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cov-core type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/coverage-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/coverage/coverage-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/coverage/coverage-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/coverage-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/coverage-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The coverage.py Python code coverage tool"
 set name=pkg.description \
     value="Coverage is a tool for measuring code coverage of Python programs. It monitors a program, noting which parts of the code have been executed, then analyzes the source to identify code that could have been executed, but was not. Coverage measurement is typically used to gauge the effectiveness of tests. It can show which parts of your code are being exercised by tests, and which are not."
@@ -87,6 +87,10 @@
 license jquery.copyright license=MIT-1
 license jquery.isonscreen.copyright license=MIT-2
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/coverage-$(PYV)@3.5,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the coverage 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/coverage/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/coverage-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/coverage-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/coverage type=require
--- a/components/python/cssutils/cssutils-GENFRAG.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cssutils/cssutils-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,10 +20,14 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 # cssutils was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package 
+# dependency is here to facilitate the safe transfer of the package
 # to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected]
+depend type=optional \
+    fmri=consolidation/desktop/desktop-inco[email protected]
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/python/cssutils/cssutils-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/cssutils/cssutils-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/cssutils-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cssutils-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="A Python package to parse and build CSS Cascading Style Sheets."
 set name=com.oracle.info.description value="the cssutils Python module"
@@ -133,9 +133,13 @@
 
 # force a dependency on the cssutils 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)
 
 # cssutils was previously in the 'desktop' consolidation. This optional
 # dependency is here to facilitate the safe transfer of the package 
 # to the 'userland' consolidation.
 depend type=optional fmri=consolidation/desktop/[email protected]
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/cssutils-$(PYV)@0.9.6,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cssutils/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cssutils-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cssutils/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cssutils-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cssutils/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/cssutils type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/d2to1-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/d2to1/d2to1-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/d2to1/d2to1-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/d2to1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/d2to1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Allow distutils2-like setup.cfg files with Python 2"
 set name=pkg.description \
     value="d2to1 allows developers to use distutils2-like setup.cfg files for a package's metadata with a distribute/setuptools setup.py script. It works by providing a distutils2-formatted setup.cfg file containing all of a package's metadata, and a very minimal setup.py which will slurp its arguments from the setup.cfg."
@@ -56,4 +56,8 @@
 
 # force a dependency on the d2to1 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/d2to1-$(PYV)@0.2.10,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/d2to1-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/d2to1-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/d2to1 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/decorator-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/decorator/decorator-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/decorator/decorator-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/decorator-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/decorator-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python decorator helper module"
 set name=pkg.description \
     value="The aim of the decorator module is to simplify the usage of decorators for the average programmer, and to popularize decorators by showing various non-trivial examples."
@@ -51,4 +51,8 @@
 
 # force a dependency on the decorator 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/decorator-$(PYV)@3.4.0,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/decorator-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/decorator-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/decorator type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/eventlet-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/eventlet/eventlet-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/eventlet/eventlet-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/eventlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/eventlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Highly concurrent networking library for Python"
 set name=pkg.description \
     value="Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it. It uses libevent for highly scalable non-blocking I/O. Coroutines or green threads ensure that the developer uses a blocking style of programming that is similar to threading, but provide the benefits of non-blocking I/O. The event dispatch is implicit, which means you can easily use Eventlet from the Python interpreter, or as a small part of a larger application."
@@ -125,7 +125,11 @@
 
 # force a dependency on the eventlet 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 greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-$(PYV)
+depend type=require fmri=library/python/greenlet-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/eventlet-$(PYV)@0.13.0,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/eventlet-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/eventlet-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/eventlet type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/filechunkio-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/filechunkio/filechunkio-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/filechunkio/filechunkio-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/filechunkio-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/filechunkio-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="filechunkio represents a chunk of an OS-level file"
 set name=pkg.description \
     value="FileChunkIO is a Python library that allows representation of chunks of files. It can be used to segment large files into multiple parts without having to split them physically up front or for creating in-memory chunks as StringIO instances."
@@ -46,4 +46,8 @@
 
 # force a dependency on the filechunkio 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/filechunkio-$(PYV)@1.5,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/filechunkio-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/filechunkio-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/filechunkio type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/formencode-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/formencode/formencode-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/formencode/formencode-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/formencode-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/formencode-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="HTML form validation, generation, and conversion package"
 set name=pkg.description \
@@ -116,4 +116,8 @@
 
 # force a dependency on the formencode package
 depend type=require \
-    fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/forme[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/formencode-$(PYV)@1.2.6,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/formencode-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/formencode-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/formencode type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/greenlet-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/greenlet/greenlet-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/greenlet/greenlet-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/greenlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/greenlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Coroutine module for Python"
 set name=pkg.description \
     value="Greenlet is a Python module providing lightweight coroutines for in-process concurrent programming."
@@ -50,4 +50,8 @@
 
 # force a dependency on the greenlet 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/greenlet-$(PYV)@0.4.1,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/greenlet-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/greenlet-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/greenlet type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/httplib2-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/httplib2/httplib2-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/httplib2/httplib2-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/httplib2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/httplib2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A comprehensive HTTP client library for Python"
 set name=pkg.description \
     value="A comprehensive HTTP client library for Python that supports many features left out of other HTTP libraries, such as Keep-Alive, Authentication, Caching, Redirects, Compression and Lost update support"
@@ -51,4 +51,8 @@
 
 # force a dependency on the httplib2 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/httplib2-$(PYV)@0.8,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/httplib2-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/httplib2-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/httplib2 type=require
--- a/components/python/imaging/imaging-GENFRAG.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/imaging/imaging-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,10 +20,15 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 # python-imaging was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package 
+# dependency is here to facilitate the safe transfer of the package
 # to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected]
+depend type=optional \
+    fmri=consolidation/desktop/[email protected]
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/python/imaging/imaging-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/imaging/imaging-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,12 +20,12 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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/python-imaging-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/python-imaging-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python's own image processing library"
 set name=pkg.description \
     value="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library provides extensive file format support, an efficient internal representation, and powerful image processing capabilities."
@@ -161,4 +161,8 @@
 
 # force a dependency on the python-imaging 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/python-imaging-$(PYV)@1.1.7,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/python-imaging-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/python-imaging-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/python-imaging type=require
--- a/components/python/importlib/importlib-26.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/importlib/importlib-26.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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 importlib module"
 set name=pkg.description \
     value="The importlib module contains the code from importlib as found in Python 2.7. It is provided so that people who wish to use importlib.import_module() with a version of Python prior to 2.7 or in 3.0 have the function readily available."
@@ -46,4 +46,8 @@
 
 # force a dependency on the importlib 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/python/importlib/importlib.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/importlib/importlib.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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 importlib module"
 set name=pkg.description \
     value="The importlib module contains the code from importlib as found in Python 2.7. It is provided so that people who wish to use importlib.import_module() with a version of Python prior to 2.7 or in 3.0 have the function readily available."
@@ -36,5 +36,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2013/279
 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.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/importlib/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/importlib-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/importlib/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/importlib type=require
--- a/components/python/ipython/ipython-GENFRAG.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/ipython/ipython-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 # ipython was previously in the 'desktop' consolidation. This optional
@@ -28,3 +28,6 @@
 # to the 'userland' consolidation.
 depend type=optional \
     fmri=consolidation/desktop/[email protected]
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0
--- a/components/python/ipython/ipython-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/ipython/ipython-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Enhanced interactive Python shell"
 set name=com.oracle.info.description value="the IPython interactive Python shell"
 set name=com.oracle.info.tpno value=9640
@@ -1820,4 +1820,8 @@
 
 # force a dependency on the ipython 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/ipython-$(PYV)@0.10,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ipython/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/ipython-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ipython/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/ipython-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ipython/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/ipython type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/iso8601-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/iso8601/iso8601-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/iso8601/iso8601-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/iso8601-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/iso8601-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Simple Python module to parse ISO 8601 dates"
 set name=pkg.description \
     value="This Python module parses the most common forms of ISO 8601 date strings into datetime objects."
@@ -50,4 +50,8 @@
 
 # force a dependency on the iso8601 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/iso8601-$(PYV)@0.1.4,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/iso8601-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/iso8601-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/iso8601 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/jsonpatch-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/jsonpatch/jsonpatch-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/jsonpatch/jsonpatch-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/jsonpatch-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/jsonpatch-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Python module for creating and applying JSON Patches"
 set name=pkg.description \
@@ -53,4 +53,8 @@
 
 # force a dependency on the jsonpatch 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/jsonpatch-$(PYV)@1.1,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonpatch-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonpatch-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonpatch type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/jsonpointer-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/jsonpointer/jsonpointer-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/jsonpointer/jsonpointer-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/jsonpointer-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/jsonpointer-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python module for resolving JSON Pointers"
 set name=pkg.description \
     value="The jsonpointer module resolves a JSON Pointer -- a string identifier for a specific object within a JSON document - - as defined by RFC 6901."
@@ -48,4 +48,8 @@
 
 # force a dependency on the jsonpointer 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/jsonpointer-$(PYV)@1.0,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonpointer-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonpointer-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonpointer type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/jsonrpclib-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/jsonrpclib/jsonrpclib-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/jsonrpclib/jsonrpclib-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/jsonrpclib-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/jsonrpclib-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
 set name=pkg.description value="The jsonrpclib library is an implementation of the JSON-RPC specification. It supports both the original 1.0 specification, as well as the new (proposed) 2.0 spec, which includes features such as batch submission and keyword arguments. It is designed to be as compatible with the syntax of xmlrpclib as possible (it extends where possible), so that projects using xmlrpclib could easily be modified to use JSON and experiment with the differences."
 set name=com.oracle.info.description \
@@ -51,7 +51,11 @@
 
 # force a dependency on the jsonrpclib 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 dependency on simplejson; pkgdepend work is needed to flush these out. 
-depend type=require fmri=library/python-2/simplejson-$(PYV)
+depend type=require fmri=library/python/simplejson-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/jsonrpclib-$(PYV)@0.1.3,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonrpclib-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonrpclib-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonrpclib type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/jsonschema-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/jsonschema/jsonschema-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/jsonschema/jsonschema-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/jsonschema-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/jsonschema-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="An implementation of JSON-Schema validation for Python"
 set name=pkg.description \
@@ -57,4 +57,8 @@
 
 # force a dependency on the jsonschema 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/jsonschema-$(PYV)@2.0.0,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonschema-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonschema-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/jsonschema type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/kombu-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,25 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/kombu/kombu-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/kombu/kombu-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,18 +18,18 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 # importlib is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/importlib-27 -> drop>
+<transform depend type=require fmri=library/python/importlib-27 -> drop>
 # ordereddict is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/ordereddict-27 -> drop>
+<transform depend type=require fmri=library/python/ordereddict-27 -> drop>
 # The test related file actions have not been included because they will fail
 # in dependency generation until the various test related modules that they
 # need are also provided.
 set name=pkg.fmri \
-    value=pkg:/library/python-2/kombu-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/kombu-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Messaging framework for Python"
 set name=pkg.description \
     value="The aim of Kombu is to make messaging in Python as easy as possible by providing an idiomatic high-level interface for the AMQ protocol (AMQP), and also provide proven and tested solutions to common messaging problems."
@@ -110,29 +110,32 @@
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on amqp; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/amqp-$(PYV)
+depend type=require fmri=library/python/amqp-$(PYV)
 
 # force a dependency on anyjson; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/anyjson-$(PYV)
+depend type=require fmri=library/python/anyjson-$(PYV)
 
 # force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-$(PYV)
+depend type=require fmri=library/python/boto-$(PYV)
 
 # force a dependency on eventlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/eventlet-$(PYV)
+depend type=require fmri=library/python/eventlet-$(PYV)
 
 # force a dependency on importlib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/importlib-$(PYV)
+depend type=require fmri=library/python/importlib-$(PYV)
 
 # force a dependency on the kombu 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 librabbitmq; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/librabbitmq-$(PYV)
+depend type=require fmri=library/python/librabbitmq-$(PYV)
 
 # force a dependency on ordereddict; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/ordereddict-$(PYV)
+depend type=require fmri=library/python/ordereddict-$(PYV)
 
 # force a dependency on pyrabbit; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyrabbit-$(PYV)
+depend type=require fmri=library/python/pyrabbit-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/kombu-$(PYV)@2.5.12,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/kombu-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/kombu-27 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/old-manifest.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/kombu type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/librabbitmq-GENFRAG.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -0,0 +1,26 @@
+#
+# 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) 2013, 2014, 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.12-5.12.0.0.0.41.0
--- a/components/python/librabbitmq/librabbitmq-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/librabbitmq/librabbitmq-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/librabbitmq-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/librabbitmq-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for AMQP Client"
 set name=pkg.description \
     value="Provides Python bindings for AMQP clients that wish to communicate with AMQP servers speaking protocol version 0-9-1."
@@ -54,4 +54,8 @@
 
 # force a dependency on the librabbitmq 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 the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/librabbitmq-$(PYV)@1.0.1,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/old-manifest-26.p5m	Mon Jan 27 17:48:58 2014 -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) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/librabbitmq-26 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/old-manifest-27.p5m	Mon Jan 27 17:48:58 2014 -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