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

3 files changed, 21 insertions, 21 deletions

diff --git a/python3-versioningit/.footprint b/python3-versioningit/.footprint
index 3b5c86335..6100da924 100644
--- a/python3-versioningit/.footprint
+++ b/python3-versioningit/.footprint
@@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rw-r--r--	root/root	usr/bin/versioningit
+-rwxr-xr-x	root/root	usr/bin/versioningit
 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/
@@ -15,21 +15,21 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/versioningit/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__main__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/__init__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/__main__.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/basics.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/cmdclasses.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/config.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/core.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/errors.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/git.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/hg.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/hook.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/logging.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/methods.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/next_version.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/onbuild.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/util.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/__init__.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/__main__.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/basics.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/cmdclasses.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/config.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/core.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/errors.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/git.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/hg.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/hook.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/logging.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/methods.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/next_version.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/onbuild.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/__pycache__/util.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/basics.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/cmdclasses.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/versioningit/config.py
diff --git a/python3-versioningit/.signature b/python3-versioningit/.signature
index 012799ab4..c571b9afe 100644
--- a/python3-versioningit/.signature
+++ b/python3-versioningit/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39PaFX/AbKdmcxG2H3iAoqbFtee8wpNcHildnBwNQk4kEGoURSDsqnQVB4t85UTpdweACtvAujYoRCwF2i2fRgA=
-SHA256 (Pkgfile) = c075bc5aa620e7c53d7e0d9ad973c86d191af472ea0f5668eee1f6788348df2b
-SHA256 (.footprint) = a4cd0144efd89cc8679b599e3c575258c5a7728a04879c2b2a0b227215a357df
+RWSagIOpLGJF33ntnoEn8BHh0fXqFx60FdRCO8TBgYrTFwWtzJyMz94N6/VHdONVd5OXjgi+TEZh1fVWhlmitVCstzw0+hSsjgA=
+SHA256 (Pkgfile) = f14d0d38ca81daf71d294d00029520de8297aed59b953a3a6f937de67401742f
+SHA256 (.footprint) = 2151a3369f734e4260ad142255007b119d6b18c6e485d78d9427b1e329b98057
 SHA256 (versioningit-2.0.0.tar.gz) = c16913af35bbe96797baa3a0910fc60b1c05d25ac591def6223fa806f99cbe58
diff --git a/python3-versioningit/Pkgfile b/python3-versioningit/Pkgfile
index 986ac58b8..790c03ef9 100644
--- a/python3-versioningit/Pkgfile
+++ b/python3-versioningit/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Versioning It with your Version In Git
 # URL: https://github.com/jwodder/versioningit
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: python3-build python3-install
+# Depends on: python3-build python3-installer
 
 name=python3-versioningit
 version=2.0.0
@@ -12,5 +12,5 @@ build() {
   cd versioningit-$version
 
   /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
-  /usr/bin/python3 -m install --optimize=1 --destdir=$PKG dist/*.whl
+  /usr/bin/python3 -m installer --compile-bytecode 2 --destdir=$PKG dist/*.whl
 }