Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 33 insertions, 44 deletions

diff --git a/python3-distlib/.footprint b/python3-distlib/.footprint
index 2d2bc2de0..4d8d1fb6c 100644
--- a/python3-distlib/.footprint
+++ b/python3-distlib/.footprint
@@ -2,40 +2,28 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/distlib-0.3.4-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.4-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.4-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.4-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.4-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/distlib-0.3.5.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.5.dist-info/LICENSE.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.5.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.5.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.5.dist-info/WHEEL
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib-0.3.5.dist-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/distlib/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/compat.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/compat.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/database.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/database.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/index.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/index.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/locators.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/locators.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/manifest.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/manifest.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/markers.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/markers.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/metadata.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/metadata.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/resources.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/resources.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/scripts.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/scripts.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/util.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/util.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/version.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/version.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/wheel.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/wheel.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/__init__.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/compat.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/database.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/index.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/locators.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/manifest.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/markers.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/metadata.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/resources.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/scripts.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/util.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/version.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/wheel.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/compat.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/database.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/index.py
@@ -45,12 +33,12 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/distlib/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/metadata.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/resources.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/scripts.py
--rw-------	root/root	usr/lib/python3.10/site-packages/distlib/t32.exe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/t32.exe
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/t64-arm.exe
--rw-------	root/root	usr/lib/python3.10/site-packages/distlib/t64.exe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/t64.exe
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/util.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/version.py
--rw-------	root/root	usr/lib/python3.10/site-packages/distlib/w32.exe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/w32.exe
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/w64-arm.exe
--rw-------	root/root	usr/lib/python3.10/site-packages/distlib/w64.exe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/w64.exe
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/distlib/wheel.py
diff --git a/python3-distlib/.signature b/python3-distlib/.signature
index abff2199a..c07c4dd2f 100644
--- a/python3-distlib/.signature
+++ b/python3-distlib/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF387wQzUj8Mi+YwgNJ/6ezCKU4uXDjBDoC2xHwtv4jc1D/bJuh2FRTHboBQqq1i9GS6rmpli3OAg1XxaP58ozmwM=
-SHA256 (Pkgfile) = 4d12d98cf7cb690f2395b4bdf93a0e2d7abea22f7776d070c527e12bcc8b9bc0
-SHA256 (.footprint) = 4ebb0364f7f3c16e80839df5edcc7c5e5921584079bd22b6c7ca70f37df877ee
-SHA256 (distlib-0.3.4.zip) = e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579
+RWSagIOpLGJF32o7UKIEpKfTDMc03Mg2Jr6mt8EMUmj16IdEDFSwf+Ab3lVqvGB4UR5ApBdvVX1VaXDA7pK4OifLnW1xYOrePAk=
+SHA256 (Pkgfile) = 32311eabd61fb94df281105eb34e8af87756ec9fa4eddb7582c5b098fc0ddddb
+SHA256 (.footprint) = 474055680a845b63063b05f71d750ce1d201d059e5edb8cb51d3b207ae989346
+SHA256 (distlib-0.3.5.tar.gz) = a7f75737c70be3b25e2bee06288cec4e4c221de18455b2dd037fe2a795cab2fe
diff --git a/python3-distlib/Pkgfile b/python3-distlib/Pkgfile
index 9a3fe04ba..ef33bdc46 100644
--- a/python3-distlib/Pkgfile
+++ b/python3-distlib/Pkgfile
@@ -1,15 +1,16 @@
 # Description: Low-level components of distutils2/packaging
 # URL: https://bitbucket.org/pypa/distlib/src/master/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: python3-setuptools
+# Depends on: python3-build python3-installer
 
 name=python3-distlib
-version=0.3.4
+version=0.3.5
 release=1
-source=(https://files.pythonhosted.org/packages/source/d/distlib/distlib-$version.zip)
+source=(https://pypi.org/packages/source/d/distlib/distlib-$version.tar.gz)
 
 build() {
   cd distlib-$version
-  /usr/bin/python3 setup.py build
-  /usr/bin/python3 setup.py install --root=$PKG --optimize=1 --skip-build
+
+  /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
+  /usr/bin/python3 -m installer --compile-bytecode 2 --destdir=$PKG dist/*.whl
 }