Merge branch '3.5' into 3.6

 Conflicts:
	p5-datetime-locale/.signature
	python3-pyqt-builder/.footprint
	python3-pyqt-builder/.signature

3 files changed, 84 insertions, 84 deletions

diff --git a/python3-pyqt-builder/.footprint b/python3-pyqt-builder/.footprint
index fd52a3371..6e123937b 100644
--- a/python3-pyqt-builder/.footprint
+++ b/python3-pyqt-builder/.footprint
@@ -2,80 +2,80 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pyqt-bundle
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python3.8/
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/PyQt_builder-1.4.0-py3.8.egg-info/top_level.txt
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/__init__.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/bindings.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/builder.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/installable.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/project.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/__pycache__/version.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bindings.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/builder.py
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/__init__.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/abstract_package.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/bundle.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/main.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/qt_metadata.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/__pycache__/verbose.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/abstract_package.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/bundle.py
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-32/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-32/concrt140.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-32/msvcp140.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-32/msvcp140_1.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-32/msvcp140_2.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-32/vcruntime140.dll
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/concrt140.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/msvcp140.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/msvcp140_1.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/msvcp140_2.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/vcruntime140.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-32/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-32/libeay32.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-64/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-64/libeay32.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-64/libssl-1_1-x64.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/main.py
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/__init__.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqt3d.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqt5.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtchart.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtdatavisualization.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtpurchasing.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtwebengine.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/pyqt3d.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/pyqt5.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/pyqtchart.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/pyqtdatavisualization.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/pyqtpurchasing.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/packages/pyqtwebengine.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/qt_metadata.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/bundle/verbose.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/installable.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/project.py
--rw-r--r--	root/root	usr/lib/python3.8/site-packages/pyqtbuild/version.py
+drwxr-xr-x	root/root	usr/lib/python3.9/
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/PyQt_builder-1.5.0-py3.9.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/__init__.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/bindings.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/builder.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/installable.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/project.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/__pycache__/version.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bindings.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/builder.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/__init__.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/abstract_package.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/bundle.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/main.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/qt_metadata.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/__pycache__/verbose.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/abstract_package.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/bundle.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-32/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-32/concrt140.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-32/msvcp140.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-32/msvcp140_1.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-32/msvcp140_2.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-32/vcruntime140.dll
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/concrt140.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/msvcp140.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/msvcp140_1.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/msvcp140_2.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/vcruntime140.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-32/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-32/libeay32.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-64/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-64/libeay32.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-64/libssl-1_1-x64.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/main.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/__init__.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqt3d.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqt5.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtchart.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtdatavisualization.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtpurchasing.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/__pycache__/pyqtwebengine.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/pyqt3d.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/pyqt5.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/pyqtchart.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/pyqtdatavisualization.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/pyqtpurchasing.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/packages/pyqtwebengine.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/qt_metadata.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/bundle/verbose.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/installable.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/project.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/pyqtbuild/version.py
diff --git a/python3-pyqt-builder/.signature b/python3-pyqt-builder/.signature
index fc6732653..c10213188 100644
--- a/python3-pyqt-builder/.signature
+++ b/python3-pyqt-builder/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+sADJliLxL+wRHmZ4DQOYgJixkfGQ7G1G6Cbuz4xWyufiiJFpk5JH8UDfyPzVWqCOaD2KGcm8Cr3QpSkBG4RAw=
-SHA256 (Pkgfile) = 1fd53349032e11942677163f0f783638f43b40304750e891d914b5575499afe0
-SHA256 (.footprint) = 8c61a5a61dd9ab056a031ccf97410fb236a1e8a485b351cb3be8b2add8c57725
-SHA256 (PyQt-builder-1.4.0.tar.gz) = be7fb8436e6ffb21b7e42266f0fa4776b7d62b0c7e06c63f8a066ff90554fcdc
+RWSagIOpLGJF3/QHF6pP0q6Sdp+FnPz55HbWyO3F5s+vKijjloWBcGb8RRzGYKRciAJprUXC3QoiALQT/XlEBxNgwwdUdC2Xyg4=
+SHA256 (Pkgfile) = b8b00ced04d5d151b227e407a53641952604947fe303834c92dec73133f52c6e
+SHA256 (.footprint) = cf69e41799f0245f2745e3f439942fb54def30c1e67f8a0253e7769c09f58e34
+SHA256 (PyQt-builder-1.5.0.tar.gz) = 11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841
diff --git a/python3-pyqt-builder/Pkgfile b/python3-pyqt-builder/Pkgfile
index 484e3c972..db84c0252 100644
--- a/python3-pyqt-builder/Pkgfile
+++ b/python3-pyqt-builder/Pkgfile
@@ -4,12 +4,12 @@
 # Depends on: python3-setuptools
 
 name=python3-pyqt-builder
-version=1.4.0
+version=1.5.0
 release=1
 source=(https://pypi.io/packages/source/P/PyQt-builder/PyQt-builder-$version.tar.gz)
 
 build() {
   cd PyQt-builder-$version
-  python3 setup.py build
-  python3 setup.py install --root=$PKG
+  /usr/bin/python3 setup.py build
+  /usr/bin/python3 setup.py install --root=$PKG
 }