Update to 11.3.1:

------
11.3.1
------

* Issue #327: Formalize and restore support for any printable character in an
  entry point name.

----
11.3
----

* Expose ``EntryPoint.resolve`` in place of EntryPoint._load, implementing the
  simple, non-requiring load. Deprecated all uses of ``EntryPoint._load``
  except for calling with no parameters, which is just a shortcut for
  ``ep.require(); ep.resolve();``.

  Apps currently invoking ``ep.load(require=False)`` should instead do the
  following if wanting to avoid the deprecating warning::

    getattr(ep, "resolve", lambda: ep.load(require=False))()

----
11.2
----

* Pip #2326: Report deprecation warning at stacklevel 2 for easier diagnosis.

----
11.1
----

* Issue #281: Since Setuptools 6.1 (Issue #268), a ValueError would be raised
  in certain cases where VersionConflict was raised with two arguments, which
  occurred in ``pkg_resources.WorkingSet.find``. This release adds support
  for indicating the dependent packages while maintaining support for
  a VersionConflict when no dependent package context is known. New unit tests
  now capture the expected interface.

3 files changed, 16 insertions, 10 deletions

diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 61618d16616..c9647f4b4bc 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2015/01/04 23:42:47 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2015/01/08 16:36:58 wiz Exp $
 
-EGG_VERSION=		11.0
+EGG_VERSION=		11.3.1
 DISTNAME=		setuptools-${EGG_VERSION}
 PKGNAME=		${PYPKGPREFIX}-setuptools-${EGG_VERSION}
 CATEGORIES=		devel python
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 5f2b5a7163f..b9e46795031 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2015/01/04 23:42:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2015/01/08 16:36:58 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
@@ -40,6 +40,15 @@ ${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.pyo
+${PYSITELIB}/pkg_resources/tests/__init__.py
+${PYSITELIB}/pkg_resources/tests/__init__.pyc
+${PYSITELIB}/pkg_resources/tests/__init__.pyo
+${PYSITELIB}/pkg_resources/tests/test_pkg_resources.py
+${PYSITELIB}/pkg_resources/tests/test_pkg_resources.pyc
+${PYSITELIB}/pkg_resources/tests/test_pkg_resources.pyo
+${PYSITELIB}/pkg_resources/tests/test_resources.py
+${PYSITELIB}/pkg_resources/tests/test_resources.pyc
+${PYSITELIB}/pkg_resources/tests/test_resources.pyo
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
 ${PYSITELIB}/setuptools/__init__.pyo
@@ -204,9 +213,6 @@ ${PYSITELIB}/setuptools/tests/test_msvc9compiler.pyo
 ${PYSITELIB}/setuptools/tests/test_packageindex.py
 ${PYSITELIB}/setuptools/tests/test_packageindex.pyc
 ${PYSITELIB}/setuptools/tests/test_packageindex.pyo
-${PYSITELIB}/setuptools/tests/test_resources.py
-${PYSITELIB}/setuptools/tests/test_resources.pyc
-${PYSITELIB}/setuptools/tests/test_resources.pyo
 ${PYSITELIB}/setuptools/tests/test_sandbox.py
 ${PYSITELIB}/setuptools/tests/test_sandbox.pyc
 ${PYSITELIB}/setuptools/tests/test_sandbox.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index 263a2f9744f..404206f1016 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.37 2015/01/04 23:42:47 wiz Exp $
+$NetBSD: distinfo,v 1.38 2015/01/08 16:36:58 wiz Exp $
 
-SHA1 (setuptools-11.0.tar.gz) = 6dcd7f04f946cf572036cf81e4d9594a28f66c06
-RMD160 (setuptools-11.0.tar.gz) = 7fcec1df1e0c23d4f53c17cc1cfe46d1990f9c0f
-Size (setuptools-11.0.tar.gz) = 636520 bytes
+SHA1 (setuptools-11.3.1.tar.gz) = 88e43ad9c2c759a33c8c44d742b6d18125ccca16
+RMD160 (setuptools-11.3.1.tar.gz) = 2dde26abe7b9cd66b9859d5f03016eda3c625d93
+Size (setuptools-11.3.1.tar.gz) = 624820 bytes
 SHA1 (patch-setup.py) = be1078e5e2b6e9ec8c859c2c6e2a4a44fe3c2840