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

3 files changed, 17 insertions, 35 deletions

diff --git a/python3-cleo/.footprint b/python3-cleo/.footprint
index cab4703f5..5e66d6d96 100644
--- a/python3-cleo/.footprint
+++ b/python3-cleo/.footprint
@@ -2,68 +2,52 @@ 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/cleo-0.8.1-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/INSTALLER
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/LICENSE
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/REQUESTED (EMPTY)
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo-0.8.1.dist-info/WHEEL
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/_compat.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/_compat.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/application.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/application.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/helpers.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/helpers.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/parser.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/__pycache__/parser.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/_compat.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/application.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/commands/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/base_command.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/base_command.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/command.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/command.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/completions_command.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/__pycache__/completions_command.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/base_command.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/command.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/__pycache__/templates.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/__pycache__/templates.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions/templates.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/commands/completions_command.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/config/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/config/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/config/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/config/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/config/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/config/__pycache__/application_config.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/config/__pycache__/application_config.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/config/application_config.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/helpers.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/io/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/buffered_io.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/buffered_io.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/console_io.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/console_io.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/io_mixin.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/io_mixin.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/buffered_io.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/io/console_io.py
@@ -72,11 +56,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/io/__pycache__/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/testers/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/application_tester.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/application_tester.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/command_tester.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/__pycache__/command_tester.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/application_tester.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/cleo/testers/command_tester.py
diff --git a/python3-cleo/.signature b/python3-cleo/.signature
index fe0ae4eac..91d193a01 100644
--- a/python3-cleo/.signature
+++ b/python3-cleo/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38r1hBQLxNQ2TOEtNWGBgahXmhLnWxNmBJOnQCfVFx8NRI/a6mg/YPXifnNgFlwG5ay5YLvlevN0VLD3tNhNmgU=
-SHA256 (Pkgfile) = 87ba79231df8f4ce3c7b24000a9c102d562db78ec2e72c226bf497fbef1029a7
-SHA256 (.footprint) = f9603e327cd241d570d70f6f528aafd720a9bdc1dce2c88170b3fd6c6a8899d2
+RWSagIOpLGJF33EGOxzS/FbEvw3DYGoNFI6jm7yId0sSOysA8v6FL47aUIajYYKJffW3V24Q/wyUPLR5YCjjro6Wpzk4E3MOPgc=
+SHA256 (Pkgfile) = f26ac6c1cb5878b4485eeddcee1b437640b01ebedb37e054d14519b2920a19c4
+SHA256 (.footprint) = 1c3e6eeb317cff49bf93f12b7b1323425b49ade7e3dbe661943b7160243bcb77
 SHA256 (python3-cleo-0.8.1.tar.gz) = 3ff6fe33d9e440dba4d9b0947e65ebebf95671d18d89b67bed1e1a09d2266bc1
diff --git a/python3-cleo/Pkgfile b/python3-cleo/Pkgfile
index f27511bdd..4580d62e1 100644
--- a/python3-cleo/Pkgfile
+++ b/python3-cleo/Pkgfile
@@ -10,10 +10,11 @@ source=(https://github.com/sdispater/cleo/archive/$version/$name-$version.tar.gz
 
 build() {
   cd cleo-$version
-  dephell deps convert --from pyproject.toml --to setup.py
-  /usr/bin/python3 setup.py build
-  /usr/bin/python3 setup.py install --prefix=/usr \
-    --root=$PKG \
-    -O1 \
-    --skip-build
+
+  if prt-get isinst python3-poetry; then
+    /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
+    /usr/bin/python3 -m install --optimize=1 --destdir=$PKG dist/*.whl
+  else
+    /usr/bin/pip3 install --isolate --root=$PKG --ignore-installed --no-deps cleo
+  fi
 }