--- a/components/python/setuptools/setuptools-26.p5m	Mon Jan 13 14:34:41 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-#
-# 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) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/setuptools-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.description value="Python 2.6 setup tools"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/084
-
-license setuptools.copyright license="PSF, ZPL"
-
-file path=usr/lib/python2.6/vendor-packages/easy_install.py
-file path=usr/lib/python2.6/vendor-packages/site.py
-file path=usr/lib/python2.6/vendor-packages/pkg_resources.py
-file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/zip-safe
-file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/SOURCES.txt
-file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/PKG-INFO
-file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/entry_points.txt
-file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/dependency_links.txt
-file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/top_level.txt
-file path=usr/lib/python2.6/vendor-packages/setuptools/sandbox.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/extension.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/package_index.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/depends.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/gui.exe
-file path=usr/lib/python2.6/vendor-packages/setuptools/archive_util.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/dist.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/__init__.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/cli.exe
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/register.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/setopt.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/saveopts.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/install.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/__init__.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/build_py.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/bdist_egg.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/develop.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/build_ext.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/upload.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/easy_install.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/test.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/rotate.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/sdist.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/install_lib.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/install_egg_info.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/egg_info.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/bdist_wininst.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/alias.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/bdist_rpm.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/command/install_scripts.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/tests/test_packageindex.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/tests/test_resources.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/tests/__init__.py
-file path=usr/lib/python2.6/vendor-packages/setuptools/tests/doctest.py
-file path=usr/bin/easy_install-2.6
-
-link path=usr/bin/easy_install target=easy_install-2.6 \
-    mediator=python mediator-version=2.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 a dependency on the setuptools package
-depend fmri=library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-

--- a/components/python/setuptools/setuptools-27.p5m	Mon Jan 13 14:34:41 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-#
-# 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) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/setuptools-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.description value="Python 2.7 setup tools"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/084
-
-license setuptools.copyright license="PSF, ZPL"
-
-file path=usr/lib/python2.7/vendor-packages/pkg_resources.py
-file path=usr/lib/python2.7/vendor-packages/easy_install.py
-file path=usr/lib/python2.7/vendor-packages/site.py
-file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/dependency_links.txt
-file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/zip-safe
-file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/top_level.txt
-file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/PKG-INFO
-file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/entry_points.txt
-file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/SOURCES.txt
-file path=usr/lib/python2.7/vendor-packages/setuptools/archive_util.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/depends.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/gui.exe
-file path=usr/lib/python2.7/vendor-packages/setuptools/__init__.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/package_index.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/sandbox.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/extension.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/cli.exe
-file path=usr/lib/python2.7/vendor-packages/setuptools/dist.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/develop.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/easy_install.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/install.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/bdist_wininst.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/egg_info.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/rotate.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/install_scripts.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/bdist_rpm.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/__init__.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/register.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/saveopts.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/upload.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/build_py.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/alias.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/test.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/install_lib.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/install_egg_info.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/setopt.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/build_ext.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/bdist_egg.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/command/sdist.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/tests/test_packageindex.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/tests/__init__.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/tests/doctest.py
-file path=usr/lib/python2.7/vendor-packages/setuptools/tests/test_resources.py pkg.depend.bypass-generate=.*
-file path=usr/bin/easy_install-2.7 pkg.depend.bypass-generate=.*
-
-link path=usr/bin/easy_install target=easy_install-2.7 \
-    mediator=python mediator-version=2.7
-
-# 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 setuptools package
-depend fmri=library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/setuptools-GENFRAG.p5m	Mon Jan 13 16:05:02 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) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+legacy pkg=SUNWpython-setuptools \
+    desc="Download, build, install, upgrade, and uninstall Python packages easily" \
+    name="setuptools"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/setuptools-PYVER.p5m	Mon Jan 13 16:05:02 2014 -0800
@@ -0,0 +1,92 @@
+#
+# 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) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/setuptools-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=com.oracle.info.tpno value=9297
+set name=com.oracle.info.description value="Python setup tools"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/084
+
+license setuptools.copyright license="PSF, ZPL"
+
+file path=usr/lib/python$(PYVER)/vendor-packages/easy_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/site.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pkg_resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/sandbox.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/extension.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/package_index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/depends.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/gui.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/archive_util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/dist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/cli.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/register.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/setopt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/saveopts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_py.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_egg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/develop.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_ext.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/upload.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/easy_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/test.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/rotate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/sdist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_lib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_egg_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/egg_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_wininst.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/alias.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_rpm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_scripts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_packageindex.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/doctest.py
+file path=usr/bin/easy_install-$(PYVER)
+
+link path=usr/bin/easy_install target=easy_install-$(PYVER) \
+    mediator=python mediator-version=$(PYVER)
+
+# force a dependency on the Python $(PYVER) runtime
+depend fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the setuptools package
+depend fmri=library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+

--- a/components/python/setuptools/setuptools.copyright	Mon Jan 13 14:34:41 2014 -0800
+++ b/components/python/setuptools/setuptools.copyright	Mon Jan 13 16:05:02 2014 -0800
@@ -1,66 +1,8 @@
-Python License
-==============
 
-Open Source Initiative OSI - Python Software Foundation License:Licensing
-Submitted by nelson on Tue, 2006-10-31 04:56. ::
-
-Python Software Foundation License
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-
-Zope License
-============
+ZPL:
+===============================================
 Open Source Initiative OSI - The Zope Public License Ver.2.0:Licensing
-Submitted by nelson on Tue, 2006-10-31 04:56. ::
+[OSI Approved License]
 
 Zope Public License (ZPL) Version 2.0
 -----------------------------------------------
@@ -121,3 +63,201 @@
 Corporation and many individuals on behalf of Zope
 Corporation.  Specific attributions are listed in the
 accompanying credits file.
+
+PSF
+===========================================
+Open Source Initiative OSI - Python Software Foundation License:Licensing
+[OSI Approved License]
+
+Python Software Foundation License
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee. This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions. Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee. This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party. As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee. Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement. This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013. This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee. This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+ACCEPT
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

--- a/components/python/setuptools/setuptools.p5m	Mon Jan 13 14:34:41 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.description value="Python setup tools"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-depend fmri=library/python-2/setuptools-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-depend fmri=library/python-2/setuptools-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
-
-legacy pkg=SUNWpython-setuptools \
-    desc="Download, build, install, upgrade, and uninstall Python packages easily" \
-    name="setuptools"