--- a/components/python/iso8601/Makefile	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/iso8601/Makefile	Fri May 30 13:54:38 2014 -0700
@@ -18,16 +18,16 @@
 #
 # 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.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		iso8601
-COMPONENT_VERSION=	0.1.4
+COMPONENT_VERSION=	0.1.10
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:7a28ccdfb316960431aa7f589f71cb10e0675917e36f6d718d9c03ec6e97f60d
+    sha256:e712ff3a18604833f5073e836aad795b21170b19bbef70947c441ed89d0ac0e1
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://code.google.com/p/pyiso8601/
 COMPONENT_BUGDB=	python-mod/iso8601

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/iso8601-GENFRAG.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 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.11-0.175.2.0.0.41.0

--- a/components/python/iso8601/iso8601-PYVER.p5m	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/iso8601/iso8601-PYVER.p5m	Fri May 30 13:54:38 2014 -0700
@@ -18,17 +18,17 @@
 #
 # 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."
 set name=com.oracle.info.description \
     value="the Python iso8601 date parsing module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=16616
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -42,13 +42,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/iso8601-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/iso8601/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/iso8601/iso8601.py
-file path=usr/lib/python$(PYVER)/vendor-packages/iso8601/test_iso8601.py
 license LICENSE license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/iso8601-$(PYV)@0.1.4,5.11-0.175.2.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 iso8601 package
 depend type=require \
-    fmri=library/python-2/iso8601@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/iso8601@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/old-manifest-26.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/iso8601-26

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/old-manifest-27.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/iso8601-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/iso8601/old-manifest.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/iso8601

--- a/components/python/oslo.config/Makefile	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/oslo.config/Makefile	Fri May 30 13:54:38 2014 -0700
@@ -18,19 +18,21 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		oslo.config
-COMPONENT_VERSION=	1.2.1
+COMPONENT_VERSION=	1.3.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e4ccf489159f0c2b1932ea282f7663daada0a7f8309edc4c34904605a98cf9f2
+    sha256:1fa44f663f7109ccc3ddd393fbc5a7a077208e116f94e41ada7fbd977f27cbab
 COMPONENT_ARCHIVE_URL=	http://tarballs.openstack.org/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
-COMPONENT_BUGDB=	python-mod/osol.config
+COMPONENT_BUGDB=	python-mod/oslo.config
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/setup.py.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/oslo.config/old-manifest-26.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/oslo.config-26

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/oslo.config/old-manifest-27.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/oslo.config-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/oslo.config/old-manifest.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/oslo.config

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/oslo.config/oslo.config-GENFRAG.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 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.11-0.175.2.0.0.41.0

--- a/components/python/oslo.config/oslo.config-PYVER.p5m	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/oslo.config/oslo.config-PYVER.p5m	Fri May 30 13:54:38 2014 -0700
@@ -24,13 +24,14 @@
 # argparse is part of python 2.7, but separate in 2.6
 <transform depend type=require fmri=library/python-2/argparse-27 -> drop>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/oslo.config-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/oslo.config-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Oslo Configuration Library"
 set name=pkg.description \
     value="The Oslo configuration API supports parsing command line arguments and .ini style configuration files."
 set name=com.oracle.info.description value="the Oslo Configuration Library"
-set name=com.oracle.info.tpno value=16316
+set name=com.oracle.info.tpno value=17861
 set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="OpenStack <[email protected]>"
@@ -49,8 +50,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/cfg.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/iniparser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo/config/types.py
 license LICENSE license="Apache v2.0"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/oslo.config-$(PYV)@1.2.1,5.11-0.175.2.0.0.41.0
+
 # force a dependency on the correct Python runtime package
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
@@ -58,9 +64,9 @@
 # force a dependency on argparse; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/argparse-$(PYV)
 
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/six-$(PYV)
+
 # force a dependency on oslo.config
 depend type=require \
-    fmri=library/python-2/oslo.config@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/six-$(PYV)
+    fmri=library/python/oslo.config@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- a/components/python/pbr/Makefile	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/pbr/Makefile	Fri May 30 13:54:38 2014 -0700
@@ -18,16 +18,16 @@
 #
 # 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.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pbr
-COMPONENT_VERSION=	0.5.21
+COMPONENT_VERSION=	0.8.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:bba90ab981fc2c086650dad4413e4626cc8b199f1c848959469f26224d3ab381
+    sha256:aad1f8296aa6c5379c3ccb07cf7819a7482bb39a835b70d7e5faa4a00fa0876a
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://pypi.python.org/pypi/pbr/
 COMPONENT_BUGDB=	python-mod/pbr
@@ -38,17 +38,8 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-COMPONENT_TEST_DIR =    $(SOURCE_DIR)
-COMPONENT_TEST_ARGS =   setup.py test
-
-# required until d2to1 is added to the CBE
-D2TO1 = $(WS_COMPONENTS)/python/d2to1/build/prototype/$(MACH)/$(PYTHON_LIB)
-
-$(D2TO1):
-	(cd ../d2to1 ; gmake install)
-
-PYTHON_ENV += PYTHONPATH=$(D2TO1)
-$(BUILD_32):	$(D2TO1)
+COMPONENT_TEST_DIR =	$(SOURCE_DIR)
+COMPONENT_TEST_ARGS =	setup.py test
 
 # common targets
 build:		$(BUILD_NO_ARCH)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pbr/old-manifest-26.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pbr-26

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pbr/old-manifest-27.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pbr-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pbr/old-manifest.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pbr

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pbr/pbr-GENFRAG.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 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.11-0.175.2.0.0.41.0

--- a/components/python/pbr/pbr-PYVER.p5m	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/pbr/pbr-PYVER.p5m	Fri May 30 13:54:38 2014 -0700
@@ -18,16 +18,16 @@
 #
 # 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/pbr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pbr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python Build Reasonableness"
 set name=pkg.description \
     value="pbr is a library that injects some useful and sensible default behaviors into your setuptools run. It builds on top of d2to1 to provide for declarative configuration. It then filters the setup.cfg data through a setup hook to fill in default values and provide more sensible behaviors."
 set name=com.oracle.info.description value="the Python pbr module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=17860
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -53,41 +53,29 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pbr/hooks/files.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pbr/hooks/metadata.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pbr/packaging.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/testr_command.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_commands.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_core.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_files.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_hooks.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_packaging.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_setup.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/test_version.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/CHANGES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/LICENSE.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/MANIFEST.in
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/README.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/data_files/a.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/data_files/b.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/data_files/c.rst
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/extra-file.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/git-extra-file.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/pbr_testpackage/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/pbr_testpackage/_setup_hooks.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/pbr_testpackage/cmd.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/pbr_testpackage/package_data/1.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/pbr_testpackage/package_data/2.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/setup.cfg
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/setup.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/testpackage/src/testext.c
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr/tests/util.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pbr/util.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pbr/version.py
 license pbr.license license="Apache v2.0, BSD"
 
+# force a group dependency on the optional nose; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/nose-$(PYV)
+
+# force a group dependency on the optional pip; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/pip-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pbr-$(PYV)@0.5.21,5.11-0.175.2.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 setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/setuptools-$(PYV)
+
 # force a dependency on the pbr package
 depend type=require \
-    fmri=library/python-2/pbr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pbr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- a/components/python/six/Makefile	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/six/Makefile	Fri May 30 13:54:38 2014 -0700
@@ -23,11 +23,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		six
-COMPONENT_VERSION=	1.4.1
+COMPONENT_VERSION=	1.6.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:f045afd6dffb755cc0411acb7ce9acc4de0e71261d4b5f91de2e68d9aa5f8367
+    sha256:d4392a7c8d91b005c002568a85faf617c67241c8cd8399cc395e8f1005aff80d
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://pypi.python.org/pypi/six/
 COMPONENT_BUGDB=	python-mod/six

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/six/old-manifest-26.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/six-26

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/six/old-manifest-27.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/six-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/six/old-manifest.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/six

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/six/six-GENFRAG.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 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.11-0.175.2.0.0.41.0

--- a/components/python/six/six-PYVER.p5m	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/six/six-PYVER.p5m	Fri May 30 13:54:38 2014 -0700
@@ -22,12 +22,12 @@
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/six-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/six-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python 2 and 3 compatibility utilities"
 set name=pkg.description \
     value="Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on both Python versions."
 set name=com.oracle.info.description value="the Python six module"
-set name=com.oracle.info.tpno value=16000
+set name=com.oracle.info.tpno value=17859
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -35,14 +35,21 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/241
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/six.py
 license LICENSE license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/six-$(PYV)@1.4.1,5.11-0.175.2.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 six package
 depend type=require \
-    fmri=library/python-2/six@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/six@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- a/components/python/websockify/Makefile	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/websockify/Makefile	Fri May 30 13:54:38 2014 -0700
@@ -25,11 +25,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		websockify
-COMPONENT_VERSION=	0.3.0
+COMPONENT_VERSION=	0.5.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	v$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:6466ba0031635a8442006ec5bfa9a19c92906b5229119b8a3cd8556d348ae801
+    sha256:b2704e9127ef8698b5b73b0cb247abd700d2a893bdd32078117e5ebc7f69cbbf
 COMPONENT_PROJECT_URL=	https://github.com/kanaka/websockify
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/archive/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	python-mod/websockify

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/websockify/old-manifest-26.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/websockify-26

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/websockify/old-manifest-27.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/websockify-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/websockify/old-manifest.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.41.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/websockify

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/websockify/websockify-GENFRAG.p5m	Fri May 30 13:54:38 2014 -0700
@@ -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) 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.11-0.175.2.0.0.41.0

--- a/components/python/websockify/websockify-PYVER.p5m	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/websockify/websockify-PYVER.p5m	Fri May 30 13:54:38 2014 -0700
@@ -26,13 +26,13 @@
 # python-extra is part of python 2.6 only
 <transform depend type=require fmri=library/python-2/python-extra-27 -> drop>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/websockify-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/websockify-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="WebSocket to TCP proxy/bridge"
 set name=pkg.description \
     value="Websockify translates WebSockets traffic to normal socket traffic. Websockify accepts the WebSockets handshake, parses it, and then begins forwarding traffic between the client and the target in both directions."
 set name=com.oracle.info.description \
     value="Websockify, the WebSockets translater"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=16167
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python \
     value="org.opensolaris.category.2008:Web Services/Communications"
@@ -60,10 +60,14 @@
 #
 license websockify.license license="LGPL3, BSD, MIT"
 
-# force a dependency on python-extra; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/python-extra-$(PYV)
+# force a group dependency on the optional python-extra; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python-2/python-extra-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/websockify-$(PYV)@0.3.0,5.11-0.175.2.0.0.41.0
 
 # force a dependency on the websockify package
 depend type=require \
-    fmri=library/python-2/websockify@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/websockify@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)