py-setuptools: update to 59.2.0.

v59.2.0
-------


Changes
^^^^^^^
* #2875: Introduce changes from pypa/distutils@514e9d0, including
support for overrides from Debian and pkgsrc, unlocking the
possibility of making SETUPTOOLS_USE_DISTUTILS=local the default
again.


v59.1.1
-------


Misc
^^^^
* #2885: Fixed errors when encountering LegacyVersions.


v59.1.0
-------


Changes
^^^^^^^
* #2497: Update packaging to 21.2.
* #2877: Back out deprecation of setup_requires and replace instead
by a deprecation of setuptools.installer and fetch_build_egg. Now
setup_requires is still supported when installed as part of a PEP
517 build, but is deprecated when an unsatisfied requirement is
encountered.
* #2879: Bump packaging to 21.2.

Documentation changes
^^^^^^^^^^^^^^^^^^^^^
* #2867: PNG/ICO images replaced with SVG in the docs.
* #2867: Added support to SVG "favicons" via "in-tree" Sphinx extension.


v59.0.1
-------


Misc
^^^^
* #2880: Removed URL requirement for ``pytest-virtualenv`` in ``setup.cfg``.
  PyPI rejects packages with dependencies external to itself.
  Instead the test dependency was overwritten via ``tox.ini``


v59.0.0
-------


Deprecations
^^^^^^^^^^^^
* #2856: Support for custom commands that inherit directly from ``distutils`` is
  **deprecated**. Users should extend classes provided by setuptools instead.

Breaking Changes
^^^^^^^^^^^^^^^^
* #2870: Started failing on invalid inline description with line
breaks :class:`ValueError` -- by :user:`webknjaz`

Changes
^^^^^^^
* #2698: Exposed exception classes from ``distutils.errors`` via ``setuptools.errors``.
* #2866: Incorporate changes from pypa/distutils@f1b0a2b.

Documentation changes
^^^^^^^^^^^^^^^^^^^^^
* #2227: Added sphinx theme customisations to display the new logo in the sidebar and
  use its colours as "accent" in the documentation -- by :user:`abravalheri`
* #2227: Added new setuptools logo, including editable files and artwork documentation
  -- by :user:`abravalheri`
* #2698: Added mentions to ``setuptools.errors`` as a way of handling custom command
  errors.
* #2698: Added instructions to migrate from ``distutils.commands`` and
  ``distutils.errors`` in the porting guide.
* #2871: Added a note to the docs that it is possible to install
  ``setup.py``-less projects in editable mode with :doc:`pip v21.1+
  <pip:index>`, only having ``setup.cfg`` and ``pyproject.toml`` in
  project root -- by :user:`webknjaz`


v58.5.3
-------


Misc
^^^^
* #2849: Add fallback for custom ``build_py`` commands inheriting directly from
  :mod:`distutils`, while still handling ``include_package_data=True`` for
  ``sdist``.


v58.5.2
-------


Misc
^^^^
* #2847: Suppress 'setup.py install' warning under bdist_wheel.


v58.5.1
-------


Misc
^^^^
* #2846: Move PkgResourcesDeprecationWarning above implicitly-called
function so that it's in the namespace when version warnings are
generated in an environment that contains them.


v58.5.0
-------


Changes
^^^^^^^
* #1461: Fix inconsistency with ``include_package_data`` and ``packages_data`` in sdist
  by replacing the loop breaking mechanism between the ``sdist`` and
  ``egg_info`` commands -- by :user:`abravalheri`


v58.4.0
-------


Changes
^^^^^^^
* #2497: Officially deprecated PEP 440 non-compliant versions.

Documentation changes
^^^^^^^^^^^^^^^^^^^^^
* #2832: Removed the deprecated ``data_files`` option from the example in the
  declarative configuration docs -- by :user:`abravalheri`
* #2832: Change type of ``data_files`` option from ``dict`` to ``section`` in
  declarative configuration docs (to match previous example) -- by
  :user:`abravalheri`


v58.3.0
-------


Changes
^^^^^^^
* #917: ``setup.py install`` and ``easy_install`` commands are now
officially deprecated. Use other standards-based installers (like
pip) and builders (like build). Workloads reliant on this behavior
should pin to this major version of Setuptools. See `Why you
shouldn't invoke setup.py directly
<https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html>`_
for more background.
* #1988: Deprecated the ``bdist_rpm`` command. Binary packages
should be built as wheels instead.
  -- by :user:`hugovk`
* #2785: Replace ``configparser``'s ``readfp`` with ``read_file``,
deprecated since Python 3.2.
  -- by :user:`hugovk`
* #2823: Officially deprecated support for ``setup_requires``.
Users are encouraged instead to migrate to PEP 518
``build-system.requires`` in ``pyproject.toml``. Users reliant on
``setup_requires`` should consider pinning to this major version
to avoid disruption.

Misc
^^^^
* #2762: Changed codecov.yml to configure the threshold to be lower
  -- by :user:`tanvimoharir`


v58.2.0
-------


Changes
^^^^^^^
* #2757: Add windows arm64 launchers for scripts generated by easy_install.
* #2800: Added ``--owner`` and ``--group`` options to the ``sdist`` command,
  for specifying file ownership within the produced tarball (similarly
  to the corresponding distutils ``sdist`` options).

Documentation changes
^^^^^^^^^^^^^^^^^^^^^
* #2792: Document how the legacy and non-legacy versions are
compared, and reference to the `PEP 440
<https://www.python.org/dev/peps/pep-0440/>`_ scheme.


v58.1.0
-------


Changes
^^^^^^^
* #2796: Merge with pypa/distutils@02e9f65ab0


v58.0.4
-------


Misc
^^^^
* #2773: Retain case in setup.cfg during sdist.


v58.0.3
-------


Misc
^^^^
* #2777: Build does not fail fast when ``use_2to3`` is supplied but set to a false value.


v58.0.2
-------


Misc
^^^^
* #2769: Build now fails fast when ``use_2to3`` is supplied.


v58.0.1
-------


Misc
^^^^
* #2765: In Distribution.finalize_options, suppress known removed entry points to avoid issues with older Setuptools.


v58.0.0
-------


Breaking Changes
^^^^^^^^^^^^^^^^
* #2086: Removed support for 2to3 during builds. Projects should
port to a unified codebase or pin to an older version of Setuptools
using PEP 518 build-requires.

Documentation changes
^^^^^^^^^^^^^^^^^^^^^
* #2746: add python_requires example

6 files changed, 49 insertions, 92 deletions

diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index a55809f7640..e70dda68ec1 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.190 2021/09/15 07:28:22 adam Exp $
+# $NetBSD: Makefile,v 1.191 2021/11/23 10:32:17 wiz Exp $
 
-# 48.0.0 and newer are broken on NetBSD
-# https://github.com/pypa/setuptools/issues/2364
-DISTNAME=	setuptools-57.5.0
+DISTNAME=	setuptools-59.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/setuptools/}
@@ -13,17 +11,29 @@ COMMENT=	New Python packaging system
 LICENSE=	python-software-foundation OR zpl-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.envs-[0-9]*:../../devel/py-jaraco.envs
+TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.path-[0-9]*:../../devel/py-jaraco.path
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-paver-[0-9]*:../../lang/py-paver
+TEST_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-#TEST_DEPENDS+=	not packaged: jaraco.envs
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 PYSETUPTESTTARGET=	pytest
 
+# This setting, which will soon be default-on again, breaks on NetBSD
+# https://github.com/pypa/setuptools/issues/2364
+# files/_distutils_system_mod should fix this, but I don't know how yet
+# https://github.com/pypa/distutils/issues/16
+#MAKE_ENV+=	SETUPTOOLS_USE_DISTUTILS=local
+
+#post-extract:
+#	${MKDIR} ${WRKSRC}/build/lib/setuptools/
+#	cp ${FILESDIR}/_distutils_system_mod ${WRKSRC}/build/lib/setuptools/
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 0215c44d5a4..e473fb281eb 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,10 +1,4 @@
-@comment $NetBSD: PLIST,v 1.57 2021/07/05 08:21:54 adam Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.58 2021/11/23 10:32:17 wiz Exp $
 ${PYSITELIB}/_distutils_hack/__init__.py
 ${PYSITELIB}/_distutils_hack/__init__.pyc
 ${PYSITELIB}/_distutils_hack/__init__.pyo
@@ -27,15 +21,15 @@ ${PYSITELIB}/pkg_resources/_vendor/packaging/__about__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/__init__.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/__init__.pyo
-${PYSITELIB}/pkg_resources/_vendor/packaging/_compat.py
-${PYSITELIB}/pkg_resources/_vendor/packaging/_compat.pyc
-${PYSITELIB}/pkg_resources/_vendor/packaging/_compat.pyo
+${PYSITELIB}/pkg_resources/_vendor/packaging/_manylinux.py
+${PYSITELIB}/pkg_resources/_vendor/packaging/_manylinux.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_manylinux.pyo
+${PYSITELIB}/pkg_resources/_vendor/packaging/_musllinux.py
+${PYSITELIB}/pkg_resources/_vendor/packaging/_musllinux.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_musllinux.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.pyo
-${PYSITELIB}/pkg_resources/_vendor/packaging/_typing.py
-${PYSITELIB}/pkg_resources/_vendor/packaging/_typing.pyc
-${PYSITELIB}/pkg_resources/_vendor/packaging/_typing.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/markers.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/markers.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/markers.pyo
@@ -63,6 +57,12 @@ ${PYSITELIB}/pkg_resources/extern/__init__.pyo
 ${PYSITELIB}/pkg_resources/tests/data/my-test-package-source/setup.py
 ${PYSITELIB}/pkg_resources/tests/data/my-test-package-source/setup.pyc
 ${PYSITELIB}/pkg_resources/tests/data/my-test-package-source/setup.pyo
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/entry_points.txt
+${PYSITELIB}/${EGG_FILE}/requires.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
 ${PYSITELIB}/setuptools/__init__.pyo
@@ -255,15 +255,15 @@ ${PYSITELIB}/setuptools/_vendor/packaging/__about__.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/__init__.py
 ${PYSITELIB}/setuptools/_vendor/packaging/__init__.pyc
 ${PYSITELIB}/setuptools/_vendor/packaging/__init__.pyo
-${PYSITELIB}/setuptools/_vendor/packaging/_compat.py
-${PYSITELIB}/setuptools/_vendor/packaging/_compat.pyc
-${PYSITELIB}/setuptools/_vendor/packaging/_compat.pyo
+${PYSITELIB}/setuptools/_vendor/packaging/_manylinux.py
+${PYSITELIB}/setuptools/_vendor/packaging/_manylinux.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_manylinux.pyo
+${PYSITELIB}/setuptools/_vendor/packaging/_musllinux.py
+${PYSITELIB}/setuptools/_vendor/packaging/_musllinux.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_musllinux.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_structures.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_structures.pyc
 ${PYSITELIB}/setuptools/_vendor/packaging/_structures.pyo
-${PYSITELIB}/setuptools/_vendor/packaging/_typing.py
-${PYSITELIB}/setuptools/_vendor/packaging/_typing.pyc
-${PYSITELIB}/setuptools/_vendor/packaging/_typing.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/markers.py
 ${PYSITELIB}/setuptools/_vendor/packaging/markers.pyc
 ${PYSITELIB}/setuptools/_vendor/packaging/markers.pyo
@@ -293,6 +293,7 @@ ${PYSITELIB}/setuptools/build_meta.pyc
 ${PYSITELIB}/setuptools/build_meta.pyo
 ${PYSITELIB}/setuptools/cli-32.exe
 ${PYSITELIB}/setuptools/cli-64.exe
+${PYSITELIB}/setuptools/cli-arm64.exe
 ${PYSITELIB}/setuptools/cli.exe
 ${PYSITELIB}/setuptools/command/__init__.py
 ${PYSITELIB}/setuptools/command/__init__.pyc
@@ -393,6 +394,7 @@ ${PYSITELIB}/setuptools/glob.pyc
 ${PYSITELIB}/setuptools/glob.pyo
 ${PYSITELIB}/setuptools/gui-32.exe
 ${PYSITELIB}/setuptools/gui-64.exe
+${PYSITELIB}/setuptools/gui-arm64.exe
 ${PYSITELIB}/setuptools/gui.exe
 ${PYSITELIB}/setuptools/installer.py
 ${PYSITELIB}/setuptools/installer.pyc
@@ -400,9 +402,6 @@ ${PYSITELIB}/setuptools/installer.pyo
 ${PYSITELIB}/setuptools/launch.py
 ${PYSITELIB}/setuptools/launch.pyc
 ${PYSITELIB}/setuptools/launch.pyo
-${PYSITELIB}/setuptools/lib2to3_ex.py
-${PYSITELIB}/setuptools/lib2to3_ex.pyc
-${PYSITELIB}/setuptools/lib2to3_ex.pyo
 ${PYSITELIB}/setuptools/monkey.py
 ${PYSITELIB}/setuptools/monkey.pyc
 ${PYSITELIB}/setuptools/monkey.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index 99e19026e96..bdb5167a56b 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.170 2021/10/26 10:19:04 nia Exp $
+$NetBSD: distinfo,v 1.171 2021/11/23 10:32:17 wiz Exp $
 
-BLAKE2s (setuptools-57.5.0.tar.gz) = 177656b0f8c5b83db16018406b1070ea8cf325ffe8bfbee982b29f25b77e3ca2
-SHA512 (setuptools-57.5.0.tar.gz) = 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c
-Size (setuptools-57.5.0.tar.gz) = 2141727 bytes
-SHA1 (patch-setuptools___distutils_sysconfig.py) = a7b51250f81fcdb1263874f13be9e05daa19d956
-SHA1 (patch-setuptools___distutils_unixccompiler.py) = 0458b62ffed862c506c9181ed851b6a13f53aa30
+BLAKE2s (setuptools-59.2.0.tar.gz) = d053063a7e7510fbdad96354448ea72edc4908400cb86e9b9974ef72cdcc95dc
+SHA512 (setuptools-59.2.0.tar.gz) = cd6acf817c548ef518f0e64172f8263b181eddeaf0cbe527b30a5db9ecf0f985b76a6d9c28a54ae7a743debb844c0c75781ebcdf81eb478f2bd67b81d1e3f847
+Size (setuptools-59.2.0.tar.gz) = 2281261 bytes
diff --git a/devel/py-setuptools/files/_distutils_system_mod b/devel/py-setuptools/files/_distutils_system_mod
new file mode 100644
index 00000000000..d2c05f868d0
--- /dev/null
+++ b/devel/py-setuptools/files/_distutils_system_mod
@@ -0,0 +1,9 @@
+# _distutils_system_mod
+
+import distutils.sysconfig
+
+
+vars(distutils.sysconfig).update(
+    _makefile_tmpl='config-{python_ver}{build_flags}',
+    _sysconfig_name_tmpl='_sysconfigdata_{platform}',
+)
diff --git a/devel/py-setuptools/patches/patch-setuptools___distutils_sysconfig.py b/devel/py-setuptools/patches/patch-setuptools___distutils_sysconfig.py
deleted file mode 100644
index aa09651203f..00000000000
--- a/devel/py-setuptools/patches/patch-setuptools___distutils_sysconfig.py
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-setuptools___distutils_sysconfig.py,v 1.1 2020/09/02 21:42:18 wiz Exp $
-
-Remove _multiarch from config path (differs across platforms).
-Simplify _sysconfigdata to include only platform name.
-
---- setuptools/_distutils/sysconfig.py.orig	2020-09-01 17:50:24.000000000 +0000
-+++ setuptools/_distutils/sysconfig.py
-@@ -274,8 +274,6 @@ def get_makefile_filename():
-         return os.path.join(_sys_home or project_base, "Makefile")
-     lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
-     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
--    if hasattr(sys.implementation, '_multiarch'):
--        config_file += '-%s' % sys.implementation._multiarch
-     return os.path.join(lib_dir, config_file, 'Makefile')
- 
- 
-@@ -451,10 +449,8 @@ def _init_posix():
-     """Initialize the module as appropriate for POSIX systems."""
-     # _sysconfigdata is generated at build time, see the sysconfig module
-     name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
--        '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
--        abi=sys.abiflags,
-+        '_sysconfigdata_{platform}'.format(
-         platform=sys.platform,
--        multiarch=getattr(sys.implementation, '_multiarch', ''),
-     ))
-     try:
-         _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
diff --git a/devel/py-setuptools/patches/patch-setuptools___distutils_unixccompiler.py b/devel/py-setuptools/patches/patch-setuptools___distutils_unixccompiler.py
deleted file mode 100644
index cc5d3f7227a..00000000000
--- a/devel/py-setuptools/patches/patch-setuptools___distutils_unixccompiler.py
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-setuptools___distutils_unixccompiler.py,v 1.1 2020/09/02 21:42:18 wiz Exp $
-
-Do not force RUNPATH vs RPATH, trust the compiler to know what the
-platform wants.
-
---- setuptools/_distutils/unixccompiler.py.orig	2020-09-01 17:50:24.000000000 +0000
-+++ setuptools/_distutils/unixccompiler.py
-@@ -242,22 +242,7 @@ class UnixCCompiler(CCompiler):
-                 return ["-Wl,+s", "-L" + dir]
-             return ["+s", "-L" + dir]
-         else:
--            if self._is_gcc(compiler):
--                # gcc on non-GNU systems does not need -Wl, but can
--                # use it anyway.  Since distutils has always passed in
--                # -Wl whenever gcc was used in the past it is probably
--                # safest to keep doing so.
--                if sysconfig.get_config_var("GNULD") == "yes":
--                    # GNU ld needs an extra option to get a RUNPATH
--                    # instead of just an RPATH.
--                    return "-Wl,--enable-new-dtags,-R" + dir
--                else:
--                    return "-Wl,-R" + dir
--            else:
--                # No idea how --enable-new-dtags would be passed on to
--                # ld if this system was using GNU ld.  Don't know if a
--                # system like this even exists.
--                return "-R" + dir
-+            return "-Wl,-R" + dir
- 
-     def library_option(self, lib):
-         return "-l" + lib