--- 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/beautifulsoup4@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/beautifulsoup4@$(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)