--- a/components/logilab-astng/logilab-astng.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,36 +18,37 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=pkg.description \
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
-    value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=com.oracle.info.description value="the logilab-astng Python module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man3
 file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
 license logilab-astng.license license=LGPLv2.1,GPLv2
+depend type=conditional \
+    fmri=library/python/logilab-astng-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/logilab-astng-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
 
-depend fmri=library/python-2/logilab-astng-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/logilab-astng-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0