Update py-setuptools to 19.4:

19.4
----

* Issue #341: Correct error in path handling of package data
  files in ``build_py`` command when package is empty.
* Distribute #323, Issue #141, Issue #207, and
  Pull Request #167: Another implementation of
  ``pkg_resources.WorkingSet`` and ``pkg_resources.Distribution``
  that supports replacing an extant package with a new one,
  allowing for setup_requires dependencies to supersede installed
  packages for the session.

----
19.3
----

* Issue #229: Implement new technique for readily incorporating
  dependencies conditionally from vendored copies or primary
  locations. Adds a new dependency on six.

3 files changed, 17 insertions, 11 deletions

diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 60a70e36876..48df23b69c9 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2015/12/27 22:58:18 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2016/01/18 23:04:14 wiz Exp $
 
-DISTNAME=		setuptools-19.2
+DISTNAME=		setuptools-19.4
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
 MASTER_SITES=		${MASTER_SITE_PYPI:=s/setuptools/}
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 34414044597..45020a4ce81 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2015/05/28 07:12:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2016/01/18 23:04:14 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
@@ -40,6 +40,12 @@ ${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/_vendor/six.py
+${PYSITELIB}/pkg_resources/_vendor/six.pyc
+${PYSITELIB}/pkg_resources/_vendor/six.pyo
+${PYSITELIB}/pkg_resources/extern/__init__.py
+${PYSITELIB}/pkg_resources/extern/__init__.pyc
+${PYSITELIB}/pkg_resources/extern/__init__.pyo
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
 ${PYSITELIB}/setuptools/__init__.pyo
@@ -109,9 +115,6 @@ ${PYSITELIB}/setuptools/command/test.pyo
 ${PYSITELIB}/setuptools/command/upload_docs.py
 ${PYSITELIB}/setuptools/command/upload_docs.pyc
 ${PYSITELIB}/setuptools/command/upload_docs.pyo
-${PYSITELIB}/setuptools/compat.py
-${PYSITELIB}/setuptools/compat.pyc
-${PYSITELIB}/setuptools/compat.pyo
 ${PYSITELIB}/setuptools/depends.py
 ${PYSITELIB}/setuptools/depends.pyc
 ${PYSITELIB}/setuptools/depends.pyo
@@ -121,6 +124,9 @@ ${PYSITELIB}/setuptools/dist.pyo
 ${PYSITELIB}/setuptools/extension.py
 ${PYSITELIB}/setuptools/extension.pyc
 ${PYSITELIB}/setuptools/extension.pyo
+${PYSITELIB}/setuptools/extern/__init__.py
+${PYSITELIB}/setuptools/extern/__init__.pyc
+${PYSITELIB}/setuptools/extern/__init__.pyo
 ${PYSITELIB}/setuptools/lib2to3_ex.py
 ${PYSITELIB}/setuptools/lib2to3_ex.pyc
 ${PYSITELIB}/setuptools/lib2to3_ex.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index bdc283dd282..ed753381f47 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.67 2015/12/27 22:58:18 wiz Exp $
+$NetBSD: distinfo,v 1.68 2016/01/18 23:04:14 wiz Exp $
 
-SHA1 (setuptools-19.2.tar.gz) = 6d84c1fdd3eca927dd2cd0f4f4a002ce23df348b
-RMD160 (setuptools-19.2.tar.gz) = dceb4b4f412f614744f975f5fdea6433bf0ae490
-SHA512 (setuptools-19.2.tar.gz) = 2494606930d6d422e8c105e8e5b40a07b23709f361164c5df40ff24c80328b861179652c7212fa38137534206c187bc4de42d249bc686d43fad18f23d0a26126
-Size (setuptools-19.2.tar.gz) = 641777 bytes
+SHA1 (setuptools-19.4.tar.gz) = 5eae2728b7ed5bafb3fe9e97f69371310efceaa9
+RMD160 (setuptools-19.4.tar.gz) = 6c92b4a891b2f9e9cd679e0e9c9ed4a50b4a27e6
+SHA512 (setuptools-19.4.tar.gz) = 463a2b00193b972e684569dce1527b34d7be9a9d0f866fd8a0c2c1a475558c539148841ca117b0a9c5507d8344dfd5ca515bc6beee59b44c6e8bf05771bc448a
+Size (setuptools-19.4.tar.gz) = 641797 bytes
 SHA1 (patch-setup.py) = be1078e5e2b6e9ec8c859c2c6e2a4a44fe3c2840