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

3 files changed, 16 insertions, 46 deletions

diff --git a/python3-keyring/.footprint b/python3-keyring/.footprint
index 4664a413c..f7f9afe08 100644
--- a/python3-keyring/.footprint
+++ b/python3-keyring/.footprint
@@ -1,38 +1,29 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/keyring
+-rw-r--r--	root/root	usr/bin/keyring
 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/keyring-23.5.0-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.0-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.0-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.0-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.0-py3.10.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.0-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.0-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/LICENSE
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/WHEEL
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring-23.5.1.dist-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__main__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/__main__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/__main__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/backend.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/backend.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/cli.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/cli.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/core.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/core.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/credentials.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/credentials.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/devpi_client.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/devpi_client.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/errors.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/errors.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/http.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/__pycache__/http.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backend.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/backends/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/OS_X.py
@@ -41,23 +32,14 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/backends/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/OS_X.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/OS_X.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/SecretService.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/SecretService.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/Windows.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/Windows.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/chainer.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/chainer.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/fail.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/fail.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/kwallet.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/kwallet.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/libsecret.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/libsecret.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/null.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/__pycache__/null.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/chainer.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/fail.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/kwallet.py
@@ -66,9 +48,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/__pycache__/api.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/__pycache__/api.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/macOS/api.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/backends/null.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/cli.py
@@ -82,21 +62,15 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/testing/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/backend.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/backend.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/util.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/__pycache__/util.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/backend.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/testing/util.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/util/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/platform_.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/platform_.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/properties.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/__pycache__/properties.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/platform_.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/keyring/util/properties.py
diff --git a/python3-keyring/.signature b/python3-keyring/.signature
index 82e86a3ba..585dbb079 100644
--- a/python3-keyring/.signature
+++ b/python3-keyring/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/O0w0a5T6tcIr2gxP8O3AVrjz8eE2dbIU+XcFb/yXhCRyWQfASYdC9y6Ip7x9adNre5yyn94EJdeZImpo0YuAc=
-SHA256 (Pkgfile) = 7a6e0f9303c3f208df9bcff9240acbfd6b3990cd4bf5882e4f6a43dda9b28aab
-SHA256 (.footprint) = 9bb123a2d49c22f6cf2173de45711668166021f29d968aea0b847a76f26c9387
-SHA256 (keyring-23.5.0.tar.gz) = 9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9
+RWSagIOpLGJF32Nbv9D2KtMju9IupqAk1M3/75D/H8PC68C+vEwE1d2knPaOjmfdk9pGhTFpr+a/w9x+/UdBdG5nypI2RUQ7JgY=
+SHA256 (Pkgfile) = a9f5a1a10a1db64a4e5b5692e9d68c8d24d39f5686212d178f723557c83fbe7c
+SHA256 (.footprint) = 338e897007cb94131b2ff7800cbc7cd52be1898e8b25d15398669f13dace3a56
+SHA256 (keyring-23.5.1.tar.gz) = dee502cdf18a98211bef428eea11456a33c00718b2f08524fd5727c7f424bffd
diff --git a/python3-keyring/Pkgfile b/python3-keyring/Pkgfile
index 6807cc872..62fd1ef36 100644
--- a/python3-keyring/Pkgfile
+++ b/python3-keyring/Pkgfile
@@ -4,18 +4,14 @@
 # Depends on: python3-entrypoints python3-importlib_metadata python3-secretstorage
 
 name=python3-keyring
-version=23.5.0
+version=23.5.1
 release=1
 source=(https://pypi.io/packages/source/k/keyring/keyring-$version.tar.gz)
 
 build() {
   cd keyring-$version
 
-  /usr/bin/python3 setup.py build
-  /usr/bin/python3 setup.py install --prefix=/usr \
-    --root=$PKG \
-    -O1 \
-    --skip-build
-
-   rm -rf $PKG/usr/lib/python3.10/site-packages/keyring/tests
+  /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
+  /usr/bin/python3 -m install --optimize=1 --destdir=$PKG dist/*.whl
+  rm -rf $PKG/usr/lib/python3.9/site-packages/keyring/tests
 }